From 0c57f3c4e0d32791a0ec362d7a82a2a5505b54a7 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Tue, 8 Mar 2016 11:40:19 -0500 Subject: [PATCH] Drop the use of magic openstack project_id When we put validation into the project_id in urls we had to expand the default set of allowed values to include 'openstack' and 'fake'. This cleans up all the instances of 'openstack' in the functional tests, and api samples, and instead uses a constant string which looks like a real project_id. We need a stable project_id and not a sentinel otherwise the samples will be arbitrarily changes on every update. Change-Id: I1099fd43d2374abd1658b0917765d5375c4b8d1d --- .../all_extensions/flavor-get-resp.json | 4 +-- .../all_extensions/flavors-detail-resp.json | 20 ++++++------- .../all_extensions/flavors-list-resp.json | 20 ++++++------- .../server-action-rebuild-resp.json | 10 +++---- .../all_extensions/server-create-resp.json | 4 +-- .../all_extensions/server-get-resp.json | 10 +++---- .../all_extensions/servers-details-resp.json | 10 +++---- .../all_extensions/servers-list-resp.json | 4 +-- .../flavor-access-create-resp.json | 4 +-- .../flavor-access-detail-resp.json | 20 ++++++------- .../flavor-access-show-resp.json | 4 +-- .../flavor-create-post-resp.json | 4 +-- doc/api_samples/flavors/flavor-get-resp.json | 4 +-- .../flavors/flavors-detail-resp.json | 20 ++++++------- .../flavors/flavors-list-resp.json | 20 ++++++------- doc/api_samples/images/image-get-resp.json | 4 +-- .../images/images-details-get-resp.json | 28 +++++++++---------- .../images/images-list-get-resp.json | 28 +++++++++---------- .../server-action-rebuild-resp.json | 10 +++---- .../os-access-ips/server-get-resp.json | 10 +++---- .../os-access-ips/server-post-resp.json | 4 +-- .../os-access-ips/servers-details-resp.json | 10 +++---- .../availability-zone-post-resp.json | 4 +-- .../server-config-drive-get-resp.json | 10 +++---- .../os-config-drive/server-post-resp.json | 4 +-- .../servers-config-drive-details-resp.json | 10 +++---- .../list-servers-detail-get.json | 10 +++---- .../server-action-rebuild-resp.json | 10 +++---- .../os-disk-config/server-get-resp.json | 10 +++---- .../os-disk-config/server-post-resp.json | 4 +-- .../server-get-resp.json | 10 +++---- .../servers-detail-resp.json | 10 +++---- .../server-get-resp.json | 10 +++---- .../servers-detail-resp.json | 10 +++---- .../v2.16/server-get-resp.json | 10 +++---- .../v2.16/servers-detail-resp.json | 10 +++---- .../v2.3/server-get-resp.json | 2 +- .../v2.3/servers-detail-resp.json | 2 +- .../os-extended-status/server-get-resp.json | 10 +++---- .../servers-detail-resp.json | 10 +++---- .../os-extended-volumes/server-get-resp.json | 10 +++---- .../servers-detail-resp.json | 10 +++---- .../v2.3/server-get-resp.json | 6 ++-- .../v2.3/servers-detail-resp.json | 6 ++-- .../os-fixed-ips/fixedips-get-resp.json | 4 +-- .../os-fixed-ips/v2.4/fixedips-get-resp.json | 4 +-- .../os-flavor-rxtx/flavor-rxtx-get-resp.json | 4 +-- .../os-flavor-rxtx/flavor-rxtx-list-resp.json | 20 ++++++------- .../os-flavor-rxtx/flavor-rxtx-post-resp.json | 4 +-- .../os-fping/fping-get-details-resp.json | 2 +- doc/api_samples/os-fping/fping-get-resp.json | 2 +- .../server-get-resp.json | 10 +++---- .../servers-details-resp.json | 10 +++---- .../servers-list-resp.json | 4 +-- .../os-migrations/v2.23/migrations-get.json | 4 +-- .../multiple-create-no-resv-post-resp.json | 4 +-- doc/api_samples/os-pci/server-get-resp.json | 2 +- .../os-pci/servers-detail-resp.json | 2 +- .../server-action-rebuild-resp.json | 10 +++---- .../os-personality/server-post-resp.json | 4 +-- ...ction-rebuild-preserve-ephemeral-resp.json | 10 +++---- .../os-rescue/server-get-resp-rescue.json | 10 +++---- .../os-rescue/server-get-resp-unrescue.json | 10 +++---- .../scheduler-hints-post-resp.json | 4 +-- .../security-groups-create-resp.json | 2 +- .../security-groups-get-resp.json | 2 +- .../security-groups-list-get-resp.json | 2 +- .../os-security-groups/server-get-resp.json | 10 +++---- .../os-security-groups/server-post-resp.json | 4 +-- .../server-security-groups-list-resp.json | 2 +- .../servers-detail-resp.json | 10 +++---- .../v2.13/server-groups-get-resp.json | 2 +- .../v2.13/server-groups-list-resp.json | 2 +- .../v2.13/server-groups-post-resp.json | 2 +- .../os-server-usage/server-get-resp.json | 10 +++---- .../os-server-usage/servers-detail-resp.json | 10 +++---- .../simple-tenant-usage-get-specific.json | 4 +-- .../simple-tenant-usage-get.json | 2 +- .../os-user-data/userdata-post-resp.json | 4 +-- .../server-sort-keys-list-resp.json | 4 +-- .../servers/server-action-rebuild-resp.json | 10 +++---- .../servers/server-create-resp.json | 4 +-- doc/api_samples/servers/server-get-resp.json | 10 +++---- doc/api_samples/servers/server-post-resp.json | 4 +-- .../servers/server-update-resp.json | 10 +++---- .../servers/servers-details-resp.json | 10 +++---- .../servers/servers-list-resp.json | 4 +-- .../servers/v2.16/server-get-resp.json | 10 +++---- .../servers/v2.16/servers-details-resp.json | 10 +++---- .../v2.19/server-action-rebuild-resp.json | 10 +++---- .../servers/v2.19/server-get-resp.json | 10 +++---- .../servers/v2.19/server-post-resp.json | 4 +-- .../servers/v2.19/server-put-resp.json | 10 +++---- .../servers/v2.19/servers-details-resp.json | 10 +++---- .../servers/v2.19/servers-list-resp.json | 4 +-- .../servers/v2.9/server-get-resp.json | 10 +++---- .../servers/v2.9/servers-details-resp.json | 10 +++---- .../servers/v2.9/servers-list-resp.json | 4 +-- nova/tests/fixtures.py | 3 +- nova/tests/functional/api/client.py | 7 +++-- .../server-action-rebuild-resp.json.tpl | 2 +- .../all_extensions/server-get-resp.json.tpl | 2 +- .../servers-details-resp.json.tpl | 2 +- .../server-action-rebuild-resp.json.tpl | 2 +- .../os-access-ips/server-get-resp.json.tpl | 2 +- .../servers-details-resp.json.tpl | 2 +- .../server-config-drive-get-resp.json.tpl | 2 +- ...servers-config-drive-details-resp.json.tpl | 2 +- .../list-servers-detail-get.json.tpl | 2 +- .../server-action-rebuild-resp.json.tpl | 2 +- .../os-disk-config/server-get-resp.json.tpl | 2 +- .../server-get-resp.json.tpl | 2 +- .../servers-detail-resp.json.tpl | 2 +- .../server-get-resp.json.tpl | 2 +- .../servers-detail-resp.json.tpl | 2 +- .../v2.16/server-get-resp.json.tpl | 2 +- .../v2.16/servers-detail-resp.json.tpl | 2 +- .../server-get-resp.json.tpl | 2 +- .../servers-detail-resp.json.tpl | 2 +- .../server-get-resp.json.tpl | 2 +- .../servers-detail-resp.json.tpl | 2 +- .../os-fping/fping-get-details-resp.json.tpl | 2 +- .../os-fping/fping-get-resp.json.tpl | 2 +- .../server-get-resp.json.tpl | 2 +- .../servers-details-resp.json.tpl | 2 +- .../v2.23/migrations-get.json.tpl | 4 +-- .../os-pci/server-get-resp.json.tpl | 2 +- .../os-pci/servers-detail-resp.json.tpl | 2 +- .../server-action-rebuild-resp.json.tpl | 2 +- ...n-rebuild-preserve-ephemeral-resp.json.tpl | 2 +- .../os-rescue/server-get-resp-rescue.json.tpl | 2 +- .../server-get-resp-unrescue.json.tpl | 2 +- .../security-groups-create-resp.json.tpl | 2 +- .../security-groups-get-resp.json.tpl | 2 +- .../security-groups-list-get-resp.json.tpl | 2 +- .../server-get-resp.json.tpl | 2 +- .../server-security-groups-list-resp.json.tpl | 2 +- .../servers-detail-resp.json.tpl | 2 +- .../v2.13/server-groups-get-resp.json.tpl | 2 +- .../v2.13/server-groups-list-resp.json.tpl | 2 +- .../v2.13/server-groups-post-resp.json.tpl | 2 +- .../os-server-usage/server-get-resp.json.tpl | 2 +- .../servers-detail-resp.json.tpl | 2 +- .../simple-tenant-usage-get-specific.json.tpl | 4 +-- .../simple-tenant-usage-get.json.tpl | 2 +- .../server-action-rebuild-resp.json.tpl | 2 +- .../servers/server-get-resp.json.tpl | 2 +- .../servers/server-update-resp.json.tpl | 2 +- .../servers/servers-details-resp.json.tpl | 2 +- .../v2.19/server-action-rebuild-resp.json.tpl | 2 +- .../servers/v2.19/server-get-resp.json.tpl | 2 +- .../servers/v2.19/server-put-resp.json.tpl | 2 +- .../v2.19/servers-details-resp.json.tpl | 2 +- .../servers/v2.9/server-get-resp.json.tpl | 2 +- .../v2.9/servers-details-resp.json.tpl | 2 +- .../api_sample_tests/test_fixed_ips.py | 4 +-- .../api_sample_tests/test_security_groups.py | 3 +- .../test_simple_tenant_usage.py | 3 +- .../tests/functional/api_samples_test_base.py | 14 ++++++---- nova/tests/functional/test_server_group.py | 5 +++- .../test_compare_result.py | 12 +++++--- nova/tests/unit/conf_fixture.py | 6 ++-- 162 files changed, 478 insertions(+), 463 deletions(-) diff --git a/doc/api_samples/all_extensions/flavor-get-resp.json b/doc/api_samples/all_extensions/flavor-get-resp.json index b68bc3c979..ab15917337 100644 --- a/doc/api_samples/all_extensions/flavor-get-resp.json +++ b/doc/api_samples/all_extensions/flavor-get-resp.json @@ -6,11 +6,11 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/1", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/1", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ], diff --git a/doc/api_samples/all_extensions/flavors-detail-resp.json b/doc/api_samples/all_extensions/flavors-detail-resp.json index 6c34aa279f..9e8a4822a6 100644 --- a/doc/api_samples/all_extensions/flavors-detail-resp.json +++ b/doc/api_samples/all_extensions/flavors-detail-resp.json @@ -8,11 +8,11 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/1", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/1", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ], @@ -30,11 +30,11 @@ "id": "2", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/2", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/2", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/2", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/2", "rel": "bookmark" } ], @@ -52,11 +52,11 @@ "id": "3", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/3", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/3", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/3", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/3", "rel": "bookmark" } ], @@ -74,11 +74,11 @@ "id": "4", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/4", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/4", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/4", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/4", "rel": "bookmark" } ], @@ -96,11 +96,11 @@ "id": "5", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/5", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/5", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/5", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/5", "rel": "bookmark" } ], diff --git a/doc/api_samples/all_extensions/flavors-list-resp.json b/doc/api_samples/all_extensions/flavors-list-resp.json index ab86d2a52a..c585f2bb52 100644 --- a/doc/api_samples/all_extensions/flavors-list-resp.json +++ b/doc/api_samples/all_extensions/flavors-list-resp.json @@ -4,11 +4,11 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/1", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/1", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ], @@ -18,11 +18,11 @@ "id": "2", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/2", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/2", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/2", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/2", "rel": "bookmark" } ], @@ -32,11 +32,11 @@ "id": "3", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/3", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/3", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/3", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/3", "rel": "bookmark" } ], @@ -46,11 +46,11 @@ "id": "4", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/4", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/4", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/4", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/4", "rel": "bookmark" } ], @@ -60,11 +60,11 @@ "id": "5", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/5", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/5", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/5", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/5", "rel": "bookmark" } ], diff --git a/doc/api_samples/all_extensions/server-action-rebuild-resp.json b/doc/api_samples/all_extensions/server-action-rebuild-resp.json index 7992834a5f..e7d03272ee 100644 --- a/doc/api_samples/all_extensions/server-action-rebuild-resp.json +++ b/doc/api_samples/all_extensions/server-action-rebuild-resp.json @@ -17,7 +17,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -28,18 +28,18 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] }, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/27568e59-cfb7-4283-a00e-4af933f2d539", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/27568e59-cfb7-4283-a00e-4af933f2d539", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/27568e59-cfb7-4283-a00e-4af933f2d539", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/27568e59-cfb7-4283-a00e-4af933f2d539", "rel": "bookmark" } ], @@ -49,7 +49,7 @@ "name": "foobar", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2012-09-25T13:36:09Z", "user_id": "fake" } diff --git a/doc/api_samples/all_extensions/server-create-resp.json b/doc/api_samples/all_extensions/server-create-resp.json index d20092ebc5..310507befd 100644 --- a/doc/api_samples/all_extensions/server-create-resp.json +++ b/doc/api_samples/all_extensions/server-create-resp.json @@ -5,11 +5,11 @@ "id": "8195065c-fea4-4d57-b93f-5c5c63fe90e8", "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/8195065c-fea4-4d57-b93f-5c5c63fe90e8", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/8195065c-fea4-4d57-b93f-5c5c63fe90e8", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/8195065c-fea4-4d57-b93f-5c5c63fe90e8", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/8195065c-fea4-4d57-b93f-5c5c63fe90e8", "rel": "bookmark" } ], diff --git a/doc/api_samples/all_extensions/server-get-resp.json b/doc/api_samples/all_extensions/server-get-resp.json index f939213aeb..66c980b495 100644 --- a/doc/api_samples/all_extensions/server-get-resp.json +++ b/doc/api_samples/all_extensions/server-get-resp.json @@ -15,7 +15,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -26,7 +26,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -34,11 +34,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/f474386b-4fb6-4e1f-b1d5-d6bf4437f7d5", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/f474386b-4fb6-4e1f-b1d5-d6bf4437f7d5", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/f474386b-4fb6-4e1f-b1d5-d6bf4437f7d5", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/f474386b-4fb6-4e1f-b1d5-d6bf4437f7d5", "rel": "bookmark" } ], @@ -67,7 +67,7 @@ } ], "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-10-31T07:31:30Z", "user_id": "fake" } diff --git a/doc/api_samples/all_extensions/servers-details-resp.json b/doc/api_samples/all_extensions/servers-details-resp.json index c5d42feb95..9b87d0e5b8 100644 --- a/doc/api_samples/all_extensions/servers-details-resp.json +++ b/doc/api_samples/all_extensions/servers-details-resp.json @@ -16,7 +16,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -27,7 +27,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -35,11 +35,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/9cbefc35-d372-40c5-88e2-9fda1b6ea12c", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/9cbefc35-d372-40c5-88e2-9fda1b6ea12c", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/9cbefc35-d372-40c5-88e2-9fda1b6ea12c", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/9cbefc35-d372-40c5-88e2-9fda1b6ea12c", "rel": "bookmark" } ], @@ -68,7 +68,7 @@ } ], "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-10-31T06:32:32Z", "user_id": "fake" } diff --git a/doc/api_samples/all_extensions/servers-list-resp.json b/doc/api_samples/all_extensions/servers-list-resp.json index 119a8d02f4..b6fa7e8d98 100644 --- a/doc/api_samples/all_extensions/servers-list-resp.json +++ b/doc/api_samples/all_extensions/servers-list-resp.json @@ -4,11 +4,11 @@ "id": "a291599e-6de2-41a6-88df-c443ddcef70d", "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/a291599e-6de2-41a6-88df-c443ddcef70d", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/a291599e-6de2-41a6-88df-c443ddcef70d", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/a291599e-6de2-41a6-88df-c443ddcef70d", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/a291599e-6de2-41a6-88df-c443ddcef70d", "rel": "bookmark" } ], diff --git a/doc/api_samples/flavor-access/flavor-access-create-resp.json b/doc/api_samples/flavor-access/flavor-access-create-resp.json index d320cf7a16..60f49f1ca6 100644 --- a/doc/api_samples/flavor-access/flavor-access-create-resp.json +++ b/doc/api_samples/flavor-access/flavor-access-create-resp.json @@ -7,11 +7,11 @@ "id": "10", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/10", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/10", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/10", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/10", "rel": "bookmark" } ], diff --git a/doc/api_samples/flavor-access/flavor-access-detail-resp.json b/doc/api_samples/flavor-access/flavor-access-detail-resp.json index e9378bedaa..28a88d55cf 100644 --- a/doc/api_samples/flavor-access/flavor-access-detail-resp.json +++ b/doc/api_samples/flavor-access/flavor-access-detail-resp.json @@ -8,11 +8,11 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/1", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/1", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ], @@ -29,11 +29,11 @@ "id": "2", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/2", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/2", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/2", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/2", "rel": "bookmark" } ], @@ -50,11 +50,11 @@ "id": "3", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/3", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/3", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/3", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/3", "rel": "bookmark" } ], @@ -71,11 +71,11 @@ "id": "4", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/4", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/4", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/4", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/4", "rel": "bookmark" } ], @@ -92,11 +92,11 @@ "id": "5", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/5", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/5", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/5", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/5", "rel": "bookmark" } ], diff --git a/doc/api_samples/flavor-access/flavor-access-show-resp.json b/doc/api_samples/flavor-access/flavor-access-show-resp.json index 8e85bed0d4..e48669eeef 100644 --- a/doc/api_samples/flavor-access/flavor-access-show-resp.json +++ b/doc/api_samples/flavor-access/flavor-access-show-resp.json @@ -7,11 +7,11 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/1", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/1", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ], diff --git a/doc/api_samples/flavor-manage/flavor-create-post-resp.json b/doc/api_samples/flavor-manage/flavor-create-post-resp.json index 94215a9a25..f275ac411a 100644 --- a/doc/api_samples/flavor-manage/flavor-create-post-resp.json +++ b/doc/api_samples/flavor-manage/flavor-create-post-resp.json @@ -7,11 +7,11 @@ "id": "10", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/10", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/10", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/10", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/10", "rel": "bookmark" } ], diff --git a/doc/api_samples/flavors/flavor-get-resp.json b/doc/api_samples/flavors/flavor-get-resp.json index 8e85bed0d4..e48669eeef 100644 --- a/doc/api_samples/flavors/flavor-get-resp.json +++ b/doc/api_samples/flavors/flavor-get-resp.json @@ -7,11 +7,11 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/1", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/1", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ], diff --git a/doc/api_samples/flavors/flavors-detail-resp.json b/doc/api_samples/flavors/flavors-detail-resp.json index e9378bedaa..28a88d55cf 100644 --- a/doc/api_samples/flavors/flavors-detail-resp.json +++ b/doc/api_samples/flavors/flavors-detail-resp.json @@ -8,11 +8,11 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/1", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/1", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ], @@ -29,11 +29,11 @@ "id": "2", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/2", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/2", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/2", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/2", "rel": "bookmark" } ], @@ -50,11 +50,11 @@ "id": "3", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/3", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/3", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/3", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/3", "rel": "bookmark" } ], @@ -71,11 +71,11 @@ "id": "4", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/4", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/4", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/4", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/4", "rel": "bookmark" } ], @@ -92,11 +92,11 @@ "id": "5", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/5", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/5", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/5", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/5", "rel": "bookmark" } ], diff --git a/doc/api_samples/flavors/flavors-list-resp.json b/doc/api_samples/flavors/flavors-list-resp.json index ab86d2a52a..c585f2bb52 100644 --- a/doc/api_samples/flavors/flavors-list-resp.json +++ b/doc/api_samples/flavors/flavors-list-resp.json @@ -4,11 +4,11 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/1", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/1", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ], @@ -18,11 +18,11 @@ "id": "2", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/2", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/2", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/2", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/2", "rel": "bookmark" } ], @@ -32,11 +32,11 @@ "id": "3", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/3", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/3", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/3", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/3", "rel": "bookmark" } ], @@ -46,11 +46,11 @@ "id": "4", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/4", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/4", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/4", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/4", "rel": "bookmark" } ], @@ -60,11 +60,11 @@ "id": "5", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/5", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/5", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/5", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/5", "rel": "bookmark" } ], diff --git a/doc/api_samples/images/image-get-resp.json b/doc/api_samples/images/image-get-resp.json index aa2c5dea62..79978776c3 100644 --- a/doc/api_samples/images/image-get-resp.json +++ b/doc/api_samples/images/image-get-resp.json @@ -6,11 +6,11 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" }, { diff --git a/doc/api_samples/images/images-details-get-resp.json b/doc/api_samples/images/images-details-get-resp.json index 12ca452e2c..dfe6ca16fa 100644 --- a/doc/api_samples/images/images-details-get-resp.json +++ b/doc/api_samples/images/images-details-get-resp.json @@ -7,11 +7,11 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" }, { @@ -39,11 +39,11 @@ "id": "155d900f-4e14-4e4c-a73d-069cbf4541e6", "links": [ { - "href": "http://openstack.example.com/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", "rel": "bookmark" }, { @@ -70,11 +70,11 @@ "id": "a2459075-d96c-40d5-893e-577ff92e721c", "links": [ { - "href": "http://openstack.example.com/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/a2459075-d96c-40d5-893e-577ff92e721c", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/a2459075-d96c-40d5-893e-577ff92e721c", "rel": "bookmark" }, { @@ -101,11 +101,11 @@ "id": "a440c04b-79fa-479c-bed1-0b816eaec379", "links": [ { - "href": "http://openstack.example.com/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/a440c04b-79fa-479c-bed1-0b816eaec379", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/a440c04b-79fa-479c-bed1-0b816eaec379", "rel": "bookmark" }, { @@ -133,11 +133,11 @@ "id": "c905cedb-7281-47e4-8a62-f26bc5fc4c77", "links": [ { - "href": "http://openstack.example.com/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", "rel": "bookmark" }, { @@ -163,11 +163,11 @@ "id": "cedef40a-ed67-4d10-800e-17455edce175", "links": [ { - "href": "http://openstack.example.com/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/cedef40a-ed67-4d10-800e-17455edce175", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/cedef40a-ed67-4d10-800e-17455edce175", "rel": "bookmark" }, { @@ -193,11 +193,11 @@ "id": "76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", "links": [ { - "href": "http://openstack.example.com/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", "rel": "bookmark" }, { diff --git a/doc/api_samples/images/images-list-get-resp.json b/doc/api_samples/images/images-list-get-resp.json index 451ce12688..00d06f96b3 100644 --- a/doc/api_samples/images/images-list-get-resp.json +++ b/doc/api_samples/images/images-list-get-resp.json @@ -4,11 +4,11 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" }, { @@ -23,11 +23,11 @@ "id": "155d900f-4e14-4e4c-a73d-069cbf4541e6", "links": [ { - "href": "http://openstack.example.com/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", "rel": "bookmark" }, { @@ -42,11 +42,11 @@ "id": "a2459075-d96c-40d5-893e-577ff92e721c", "links": [ { - "href": "http://openstack.example.com/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/a2459075-d96c-40d5-893e-577ff92e721c", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/a2459075-d96c-40d5-893e-577ff92e721c", "rel": "bookmark" }, { @@ -61,11 +61,11 @@ "id": "a440c04b-79fa-479c-bed1-0b816eaec379", "links": [ { - "href": "http://openstack.example.com/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/a440c04b-79fa-479c-bed1-0b816eaec379", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/a440c04b-79fa-479c-bed1-0b816eaec379", "rel": "bookmark" }, { @@ -80,11 +80,11 @@ "id": "c905cedb-7281-47e4-8a62-f26bc5fc4c77", "links": [ { - "href": "http://openstack.example.com/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", "rel": "bookmark" }, { @@ -99,11 +99,11 @@ "id": "cedef40a-ed67-4d10-800e-17455edce175", "links": [ { - "href": "http://openstack.example.com/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/cedef40a-ed67-4d10-800e-17455edce175", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/cedef40a-ed67-4d10-800e-17455edce175", "rel": "bookmark" }, { @@ -118,11 +118,11 @@ "id": "76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", "links": [ { - "href": "http://openstack.example.com/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", "rel": "bookmark" }, { diff --git a/doc/api_samples/os-access-ips/server-action-rebuild-resp.json b/doc/api_samples/os-access-ips/server-action-rebuild-resp.json index e3475dc18d..79b0568347 100644 --- a/doc/api_samples/os-access-ips/server-action-rebuild-resp.json +++ b/doc/api_samples/os-access-ips/server-action-rebuild-resp.json @@ -14,7 +14,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -25,18 +25,18 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] }, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/53a63a19-c145-47f8-9ae5-b39d6bff33ec", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/53a63a19-c145-47f8-9ae5-b39d6bff33ec", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/53a63a19-c145-47f8-9ae5-b39d6bff33ec", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/53a63a19-c145-47f8-9ae5-b39d6bff33ec", "rel": "bookmark" } ], @@ -48,7 +48,7 @@ "accessIPv6": "80fe::", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-11-06T07:51:11Z", "user_id": "fake" } diff --git a/doc/api_samples/os-access-ips/server-get-resp.json b/doc/api_samples/os-access-ips/server-get-resp.json index 3bbb9379d0..130ba4acec 100644 --- a/doc/api_samples/os-access-ips/server-get-resp.json +++ b/doc/api_samples/os-access-ips/server-get-resp.json @@ -15,7 +15,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -26,18 +26,18 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] }, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/5eedbf0c-c303-4ed3-933a-a4d3732cfa0a", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/5eedbf0c-c303-4ed3-933a-a4d3732cfa0a", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/5eedbf0c-c303-4ed3-933a-a4d3732cfa0a", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/5eedbf0c-c303-4ed3-933a-a4d3732cfa0a", "rel": "bookmark" } ], @@ -49,7 +49,7 @@ "accessIPv6": "fe80::", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-11T03:23:13Z", "user_id": "fake", "key_name": null diff --git a/doc/api_samples/os-access-ips/server-post-resp.json b/doc/api_samples/os-access-ips/server-post-resp.json index 6008e075b4..9c31e93c9a 100644 --- a/doc/api_samples/os-access-ips/server-post-resp.json +++ b/doc/api_samples/os-access-ips/server-post-resp.json @@ -4,11 +4,11 @@ "id": "934760e1-2b0b-4f9e-a916-eac1e69839dc", "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/934760e1-2b0b-4f9e-a916-eac1e69839dc", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/934760e1-2b0b-4f9e-a916-eac1e69839dc", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/934760e1-2b0b-4f9e-a916-eac1e69839dc", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/934760e1-2b0b-4f9e-a916-eac1e69839dc", "rel": "bookmark" } ] diff --git a/doc/api_samples/os-access-ips/servers-details-resp.json b/doc/api_samples/os-access-ips/servers-details-resp.json index f052b2f653..844506ea31 100644 --- a/doc/api_samples/os-access-ips/servers-details-resp.json +++ b/doc/api_samples/os-access-ips/servers-details-resp.json @@ -16,7 +16,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -27,18 +27,18 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] }, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/934760e1-2b0b-4f9e-a916-eac1e69839dc", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/934760e1-2b0b-4f9e-a916-eac1e69839dc", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/934760e1-2b0b-4f9e-a916-eac1e69839dc", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/934760e1-2b0b-4f9e-a916-eac1e69839dc", "rel": "bookmark" } ], @@ -50,7 +50,7 @@ "accessIPv6": "fe80::", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-11T03:23:12Z", "user_id": "fake", "key_name": null diff --git a/doc/api_samples/os-availability-zone/availability-zone-post-resp.json b/doc/api_samples/os-availability-zone/availability-zone-post-resp.json index 4c713a793b..d5821b679c 100644 --- a/doc/api_samples/os-availability-zone/availability-zone-post-resp.json +++ b/doc/api_samples/os-availability-zone/availability-zone-post-resp.json @@ -4,11 +4,11 @@ "id": "3e45fa2a-5204-466f-a684-c2a8e1c82d7f", "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/3e45fa2a-5204-466f-a684-c2a8e1c82d7f", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/3e45fa2a-5204-466f-a684-c2a8e1c82d7f", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/3e45fa2a-5204-466f-a684-c2a8e1c82d7f", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/3e45fa2a-5204-466f-a684-c2a8e1c82d7f", "rel": "bookmark" } ] diff --git a/doc/api_samples/os-config-drive/server-config-drive-get-resp.json b/doc/api_samples/os-config-drive/server-config-drive-get-resp.json index 2948b78b95..cd5279aad8 100644 --- a/doc/api_samples/os-config-drive/server-config-drive-get-resp.json +++ b/doc/api_samples/os-config-drive/server-config-drive-get-resp.json @@ -17,7 +17,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -28,7 +28,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -36,11 +36,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/7838ff1b-b71f-48b9-91e9-7c08de20b249", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/7838ff1b-b71f-48b9-91e9-7c08de20b249", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/7838ff1b-b71f-48b9-91e9-7c08de20b249", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/7838ff1b-b71f-48b9-91e9-7c08de20b249", "rel": "bookmark" } ], @@ -51,7 +51,7 @@ "config_drive": "", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-22T02:33:25Z", "user_id": "fake" } diff --git a/doc/api_samples/os-config-drive/server-post-resp.json b/doc/api_samples/os-config-drive/server-post-resp.json index 25a1750e32..971625574e 100644 --- a/doc/api_samples/os-config-drive/server-post-resp.json +++ b/doc/api_samples/os-config-drive/server-post-resp.json @@ -4,11 +4,11 @@ "id": "f0318e69-11eb-4aed-9840-59b6c72beee8", "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/f0318e69-11eb-4aed-9840-59b6c72beee8", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/f0318e69-11eb-4aed-9840-59b6c72beee8", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/f0318e69-11eb-4aed-9840-59b6c72beee8", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/f0318e69-11eb-4aed-9840-59b6c72beee8", "rel": "bookmark" } ] diff --git a/doc/api_samples/os-config-drive/servers-config-drive-details-resp.json b/doc/api_samples/os-config-drive/servers-config-drive-details-resp.json index 81759bd949..e78d1f3b26 100644 --- a/doc/api_samples/os-config-drive/servers-config-drive-details-resp.json +++ b/doc/api_samples/os-config-drive/servers-config-drive-details-resp.json @@ -18,7 +18,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -29,7 +29,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -37,11 +37,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/f0318e69-11eb-4aed-9840-59b6c72beee8", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/f0318e69-11eb-4aed-9840-59b6c72beee8", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/f0318e69-11eb-4aed-9840-59b6c72beee8", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/f0318e69-11eb-4aed-9840-59b6c72beee8", "rel": "bookmark" } ], @@ -52,7 +52,7 @@ "config_drive": "", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-22T02:33:19Z", "user_id": "fake" } diff --git a/doc/api_samples/os-disk-config/list-servers-detail-get.json b/doc/api_samples/os-disk-config/list-servers-detail-get.json index 8ebcf9462a..b6efc57c1c 100644 --- a/doc/api_samples/os-disk-config/list-servers-detail-get.json +++ b/doc/api_samples/os-disk-config/list-servers-detail-get.json @@ -19,7 +19,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -30,18 +30,18 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] }, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/05372e62-05b9-4ee2-9343-9a1fdf2a5fda", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/05372e62-05b9-4ee2-9343-9a1fdf2a5fda", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/05372e62-05b9-4ee2-9343-9a1fdf2a5fda", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/05372e62-05b9-4ee2-9343-9a1fdf2a5fda", "rel": "bookmark" } ], @@ -51,7 +51,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2012-12-02T02:11:56Z", "key_name": null, "user_id": "fake" diff --git a/doc/api_samples/os-disk-config/server-action-rebuild-resp.json b/doc/api_samples/os-disk-config/server-action-rebuild-resp.json index 24e1e5d042..8c6abaff81 100644 --- a/doc/api_samples/os-disk-config/server-action-rebuild-resp.json +++ b/doc/api_samples/os-disk-config/server-action-rebuild-resp.json @@ -17,7 +17,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -28,18 +28,18 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] }, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/63a8aa13-60fe-41c4-b079-77f6fdf3c841", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/63a8aa13-60fe-41c4-b079-77f6fdf3c841", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/63a8aa13-60fe-41c4-b079-77f6fdf3c841", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/63a8aa13-60fe-41c4-b079-77f6fdf3c841", "rel": "bookmark" } ], @@ -49,7 +49,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2012-12-02T02:11:56Z", "user_id": "fake" } diff --git a/doc/api_samples/os-disk-config/server-get-resp.json b/doc/api_samples/os-disk-config/server-get-resp.json index 3bddcd4054..643f711384 100644 --- a/doc/api_samples/os-disk-config/server-get-resp.json +++ b/doc/api_samples/os-disk-config/server-get-resp.json @@ -18,7 +18,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -29,18 +29,18 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] }, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/5046e2f2-3b33-4041-b3cf-e085f73e78e7", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/5046e2f2-3b33-4041-b3cf-e085f73e78e7", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/5046e2f2-3b33-4041-b3cf-e085f73e78e7", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/5046e2f2-3b33-4041-b3cf-e085f73e78e7", "rel": "bookmark" } ], @@ -50,7 +50,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2012-12-02T02:11:55Z", "key_name": null, "user_id": "fake" diff --git a/doc/api_samples/os-disk-config/server-post-resp.json b/doc/api_samples/os-disk-config/server-post-resp.json index f5c1a70f1c..79614ccabe 100644 --- a/doc/api_samples/os-disk-config/server-post-resp.json +++ b/doc/api_samples/os-disk-config/server-post-resp.json @@ -5,11 +5,11 @@ "id": "324dfb7d-f4a9-419a-9a19-237df04b443b", "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/324dfb7d-f4a9-419a-9a19-237df04b443b", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/324dfb7d-f4a9-419a-9a19-237df04b443b", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/324dfb7d-f4a9-419a-9a19-237df04b443b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/324dfb7d-f4a9-419a-9a19-237df04b443b", "rel": "bookmark" } ] diff --git a/doc/api_samples/os-extended-availability-zone/server-get-resp.json b/doc/api_samples/os-extended-availability-zone/server-get-resp.json index c3962cac15..01bcc70f9d 100644 --- a/doc/api_samples/os-extended-availability-zone/server-get-resp.json +++ b/doc/api_samples/os-extended-availability-zone/server-get-resp.json @@ -17,7 +17,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -28,7 +28,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -36,11 +36,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/f22e4521-d03a-4e9f-9fd3-016b9e227219", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/f22e4521-d03a-4e9f-9fd3-016b9e227219", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/f22e4521-d03a-4e9f-9fd3-016b9e227219", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/f22e4521-d03a-4e9f-9fd3-016b9e227219", "rel": "bookmark" } ], @@ -51,7 +51,7 @@ "OS-EXT-AZ:availability_zone": "nova", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-16T02:54:57Z", "user_id": "fake" } diff --git a/doc/api_samples/os-extended-availability-zone/servers-detail-resp.json b/doc/api_samples/os-extended-availability-zone/servers-detail-resp.json index 1a03b3380f..1d8b976333 100644 --- a/doc/api_samples/os-extended-availability-zone/servers-detail-resp.json +++ b/doc/api_samples/os-extended-availability-zone/servers-detail-resp.json @@ -18,7 +18,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -29,7 +29,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -37,11 +37,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/55f43fa2-dc7c-4c0b-b21a-76f9abe516f9", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/55f43fa2-dc7c-4c0b-b21a-76f9abe516f9", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/55f43fa2-dc7c-4c0b-b21a-76f9abe516f9", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/55f43fa2-dc7c-4c0b-b21a-76f9abe516f9", "rel": "bookmark" } ], @@ -52,7 +52,7 @@ "OS-EXT-AZ:availability_zone": "nova", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-16T02:54:58Z", "user_id": "fake" } diff --git a/doc/api_samples/os-extended-server-attributes/server-get-resp.json b/doc/api_samples/os-extended-server-attributes/server-get-resp.json index fc82abc085..4e9452c7e9 100644 --- a/doc/api_samples/os-extended-server-attributes/server-get-resp.json +++ b/doc/api_samples/os-extended-server-attributes/server-get-resp.json @@ -15,7 +15,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -26,7 +26,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -34,11 +34,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/c278163e-36f9-4cf2-b1ac-80db4c63f7a8", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/c278163e-36f9-4cf2-b1ac-80db4c63f7a8", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/c278163e-36f9-4cf2-b1ac-80db4c63f7a8", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/c278163e-36f9-4cf2-b1ac-80db4c63f7a8", "rel": "bookmark" } ], @@ -53,7 +53,7 @@ "accessIPv6": "80fe::", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-16T02:55:08Z", "user_id": "fake" } diff --git a/doc/api_samples/os-extended-server-attributes/servers-detail-resp.json b/doc/api_samples/os-extended-server-attributes/servers-detail-resp.json index 6a4dd8005d..81e792e4e6 100644 --- a/doc/api_samples/os-extended-server-attributes/servers-detail-resp.json +++ b/doc/api_samples/os-extended-server-attributes/servers-detail-resp.json @@ -16,7 +16,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -27,7 +27,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -35,11 +35,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46", "rel": "bookmark" } ], @@ -54,7 +54,7 @@ "accessIPv6": "80fe::", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-16T02:55:05Z", "user_id": "fake" } diff --git a/doc/api_samples/os-extended-server-attributes/v2.16/server-get-resp.json b/doc/api_samples/os-extended-server-attributes/v2.16/server-get-resp.json index bbcc25fc95..aa4afc5f4c 100644 --- a/doc/api_samples/os-extended-server-attributes/v2.16/server-get-resp.json +++ b/doc/api_samples/os-extended-server-attributes/v2.16/server-get-resp.json @@ -15,7 +15,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -26,7 +26,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -34,11 +34,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/c278163e-36f9-4cf2-b1ac-80db4c63f7a8", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/c278163e-36f9-4cf2-b1ac-80db4c63f7a8", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/c278163e-36f9-4cf2-b1ac-80db4c63f7a8", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/c278163e-36f9-4cf2-b1ac-80db4c63f7a8", "rel": "bookmark" } ], @@ -62,7 +62,7 @@ "progress": 0, "status": "ACTIVE", "host_status": "UP", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-16T02:55:08Z", "user_id": "fake" } diff --git a/doc/api_samples/os-extended-server-attributes/v2.16/servers-detail-resp.json b/doc/api_samples/os-extended-server-attributes/v2.16/servers-detail-resp.json index 47c163a194..5548c8db14 100644 --- a/doc/api_samples/os-extended-server-attributes/v2.16/servers-detail-resp.json +++ b/doc/api_samples/os-extended-server-attributes/v2.16/servers-detail-resp.json @@ -16,7 +16,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -27,7 +27,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -35,11 +35,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46", "rel": "bookmark" } ], @@ -63,7 +63,7 @@ "progress": 0, "status": "ACTIVE", "host_status": "UP", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-16T02:55:05Z", "user_id": "fake" } diff --git a/doc/api_samples/os-extended-server-attributes/v2.3/server-get-resp.json b/doc/api_samples/os-extended-server-attributes/v2.3/server-get-resp.json index b11dba20cf..8e6d0d350c 100644 --- a/doc/api_samples/os-extended-server-attributes/v2.3/server-get-resp.json +++ b/doc/api_samples/os-extended-server-attributes/v2.3/server-get-resp.json @@ -58,7 +58,7 @@ "OS-EXT-SRV-ATTR:userdata": "fake", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-16T02:55:08Z", "user_id": "fake" } diff --git a/doc/api_samples/os-extended-server-attributes/v2.3/servers-detail-resp.json b/doc/api_samples/os-extended-server-attributes/v2.3/servers-detail-resp.json index 2226210175..6695ee22e5 100644 --- a/doc/api_samples/os-extended-server-attributes/v2.3/servers-detail-resp.json +++ b/doc/api_samples/os-extended-server-attributes/v2.3/servers-detail-resp.json @@ -59,7 +59,7 @@ "OS-EXT-SRV-ATTR:userdata": "fake", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-16T02:55:05Z", "user_id": "fake" } diff --git a/doc/api_samples/os-extended-status/server-get-resp.json b/doc/api_samples/os-extended-status/server-get-resp.json index 89b2a8cdde..b75fd3ff23 100644 --- a/doc/api_samples/os-extended-status/server-get-resp.json +++ b/doc/api_samples/os-extended-status/server-get-resp.json @@ -15,7 +15,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -26,7 +26,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -34,11 +34,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/a868cb5e-c794-47bf-9cd8-e302b72bb94b", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/a868cb5e-c794-47bf-9cd8-e302b72bb94b", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/a868cb5e-c794-47bf-9cd8-e302b72bb94b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/a868cb5e-c794-47bf-9cd8-e302b72bb94b", "rel": "bookmark" } ], @@ -53,7 +53,7 @@ "accessIPv6": "80fe::", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-16T03:07:07Z", "user_id": "fake" } diff --git a/doc/api_samples/os-extended-status/servers-detail-resp.json b/doc/api_samples/os-extended-status/servers-detail-resp.json index fac64b819c..14d9520dae 100644 --- a/doc/api_samples/os-extended-status/servers-detail-resp.json +++ b/doc/api_samples/os-extended-status/servers-detail-resp.json @@ -16,7 +16,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -27,7 +27,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -35,11 +35,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/6c8b5385-e74c-4fd5-add6-2fcf42d74a98", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/6c8b5385-e74c-4fd5-add6-2fcf42d74a98", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/6c8b5385-e74c-4fd5-add6-2fcf42d74a98", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/6c8b5385-e74c-4fd5-add6-2fcf42d74a98", "rel": "bookmark" } ], @@ -54,7 +54,7 @@ "accessIPv6": "80fe::", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-16T03:07:10Z", "user_id": "fake" } diff --git a/doc/api_samples/os-extended-volumes/server-get-resp.json b/doc/api_samples/os-extended-volumes/server-get-resp.json index 33d6e8d2d6..fd55c36b95 100644 --- a/doc/api_samples/os-extended-volumes/server-get-resp.json +++ b/doc/api_samples/os-extended-volumes/server-get-resp.json @@ -17,7 +17,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -28,7 +28,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -36,11 +36,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/7d62983e-23df-4320-bc89-bbc77f2a2e40", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/7d62983e-23df-4320-bc89-bbc77f2a2e40", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/7d62983e-23df-4320-bc89-bbc77f2a2e40", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/7d62983e-23df-4320-bc89-bbc77f2a2e40", "rel": "bookmark" } ], @@ -58,7 +58,7 @@ ], "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-16T03:22:29Z", "user_id": "fake" } diff --git a/doc/api_samples/os-extended-volumes/servers-detail-resp.json b/doc/api_samples/os-extended-volumes/servers-detail-resp.json index 7e3481105f..02df402822 100644 --- a/doc/api_samples/os-extended-volumes/servers-detail-resp.json +++ b/doc/api_samples/os-extended-volumes/servers-detail-resp.json @@ -18,7 +18,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -29,7 +29,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -37,11 +37,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/8e479732-7701-48cd-af7a-04d84f51b742", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/8e479732-7701-48cd-af7a-04d84f51b742", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/8e479732-7701-48cd-af7a-04d84f51b742", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/8e479732-7701-48cd-af7a-04d84f51b742", "rel": "bookmark" } ], @@ -59,7 +59,7 @@ ], "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-16T03:22:34Z", "user_id": "fake" } diff --git a/doc/api_samples/os-extended-volumes/v2.3/server-get-resp.json b/doc/api_samples/os-extended-volumes/v2.3/server-get-resp.json index ff9ee413cd..e984753847 100644 --- a/doc/api_samples/os-extended-volumes/v2.3/server-get-resp.json +++ b/doc/api_samples/os-extended-volumes/v2.3/server-get-resp.json @@ -34,11 +34,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/7d62983e-23df-4320-bc89-bbc77f2a2e40", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/7d62983e-23df-4320-bc89-bbc77f2a2e40", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/7d62983e-23df-4320-bc89-bbc77f2a2e40", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/7d62983e-23df-4320-bc89-bbc77f2a2e40", "rel": "bookmark" } ], @@ -58,7 +58,7 @@ ], "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-16T03:22:29Z", "user_id": "fake" } diff --git a/doc/api_samples/os-extended-volumes/v2.3/servers-detail-resp.json b/doc/api_samples/os-extended-volumes/v2.3/servers-detail-resp.json index 4e4298f2ea..040f7baaaf 100644 --- a/doc/api_samples/os-extended-volumes/v2.3/servers-detail-resp.json +++ b/doc/api_samples/os-extended-volumes/v2.3/servers-detail-resp.json @@ -35,11 +35,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/8e479732-7701-48cd-af7a-04d84f51b742", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/8e479732-7701-48cd-af7a-04d84f51b742", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/8e479732-7701-48cd-af7a-04d84f51b742", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/8e479732-7701-48cd-af7a-04d84f51b742", "rel": "bookmark" } ], @@ -59,7 +59,7 @@ ], "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-16T03:22:34Z", "user_id": "fake" } diff --git a/doc/api_samples/os-fixed-ips/fixedips-get-resp.json b/doc/api_samples/os-fixed-ips/fixedips-get-resp.json index d63c91559a..e655f5cf7a 100644 --- a/doc/api_samples/os-fixed-ips/fixedips-get-resp.json +++ b/doc/api_samples/os-fixed-ips/fixedips-get-resp.json @@ -3,6 +3,6 @@ "address": "192.168.1.1", "cidr": "192.168.1.0/24", "host": "host", - "hostname": "openstack" + "hostname": "compute.host.pvt" } -} \ No newline at end of file +} diff --git a/doc/api_samples/os-fixed-ips/v2.4/fixedips-get-resp.json b/doc/api_samples/os-fixed-ips/v2.4/fixedips-get-resp.json index 62fe02c5de..b3a43502bc 100644 --- a/doc/api_samples/os-fixed-ips/v2.4/fixedips-get-resp.json +++ b/doc/api_samples/os-fixed-ips/v2.4/fixedips-get-resp.json @@ -3,7 +3,7 @@ "address": "192.168.1.1", "cidr": "192.168.1.0/24", "host": "host", - "hostname": "openstack", + "hostname": "compute.host.pvt", "reserved": false } -} \ No newline at end of file +} diff --git a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json b/doc/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json index 5bb210a439..7dbf111076 100644 --- a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json +++ b/doc/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json @@ -7,11 +7,11 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/1", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/1", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ], diff --git a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json b/doc/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json index 6c34aa279f..9e8a4822a6 100644 --- a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json +++ b/doc/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json @@ -8,11 +8,11 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/1", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/1", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ], @@ -30,11 +30,11 @@ "id": "2", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/2", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/2", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/2", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/2", "rel": "bookmark" } ], @@ -52,11 +52,11 @@ "id": "3", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/3", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/3", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/3", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/3", "rel": "bookmark" } ], @@ -74,11 +74,11 @@ "id": "4", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/4", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/4", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/4", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/4", "rel": "bookmark" } ], @@ -96,11 +96,11 @@ "id": "5", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/5", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/5", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/5", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/5", "rel": "bookmark" } ], diff --git a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json b/doc/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json index 8b907fabc8..9a48582fbc 100644 --- a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json +++ b/doc/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json @@ -7,11 +7,11 @@ "id": "100", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/100", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/100", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/100", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/100", "rel": "bookmark" } ], diff --git a/doc/api_samples/os-fping/fping-get-details-resp.json b/doc/api_samples/os-fping/fping-get-details-resp.json index a5692832b5..7b2b401f8c 100644 --- a/doc/api_samples/os-fping/fping-get-details-resp.json +++ b/doc/api_samples/os-fping/fping-get-details-resp.json @@ -2,6 +2,6 @@ "server": { "alive": false, "id": "f5e6fd6d-c0a3-4f9e-aabf-d69196b6d11a", - "project_id": "openstack" + "project_id": "6f70656e737461636b20342065766572" } } \ No newline at end of file diff --git a/doc/api_samples/os-fping/fping-get-resp.json b/doc/api_samples/os-fping/fping-get-resp.json index 11bf37edd6..43b5567dc4 100644 --- a/doc/api_samples/os-fping/fping-get-resp.json +++ b/doc/api_samples/os-fping/fping-get-resp.json @@ -3,7 +3,7 @@ { "alive": false, "id": "1d1aea35-472b-40cf-9337-8eb68480aaa1", - "project_id": "openstack" + "project_id": "6f70656e737461636b20342065766572" } ] } \ No newline at end of file diff --git a/doc/api_samples/os-hide-server-addresses/server-get-resp.json b/doc/api_samples/os-hide-server-addresses/server-get-resp.json index bb8cec6710..0b913ac7d8 100644 --- a/doc/api_samples/os-hide-server-addresses/server-get-resp.json +++ b/doc/api_samples/os-hide-server-addresses/server-get-resp.json @@ -8,7 +8,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -19,7 +19,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -27,11 +27,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/4bdee8c7-507f-40f2-8429-d301edd3791b", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/4bdee8c7-507f-40f2-8429-d301edd3791b", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/4bdee8c7-507f-40f2-8429-d301edd3791b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/4bdee8c7-507f-40f2-8429-d301edd3791b", "rel": "bookmark" } ], @@ -41,7 +41,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-24T14:39:01Z", "user_id": "fake" } diff --git a/doc/api_samples/os-hide-server-addresses/servers-details-resp.json b/doc/api_samples/os-hide-server-addresses/servers-details-resp.json index d11503a105..645704f377 100644 --- a/doc/api_samples/os-hide-server-addresses/servers-details-resp.json +++ b/doc/api_samples/os-hide-server-addresses/servers-details-resp.json @@ -9,7 +9,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -20,7 +20,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -28,11 +28,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/a747eac1-e3ed-446c-935a-c2a2853f919c", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/a747eac1-e3ed-446c-935a-c2a2853f919c", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/a747eac1-e3ed-446c-935a-c2a2853f919c", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/a747eac1-e3ed-446c-935a-c2a2853f919c", "rel": "bookmark" } ], @@ -42,7 +42,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-24T14:44:01Z", "user_id": "fake" } diff --git a/doc/api_samples/os-hide-server-addresses/servers-list-resp.json b/doc/api_samples/os-hide-server-addresses/servers-list-resp.json index 7d68f47f83..2e543f3e0b 100644 --- a/doc/api_samples/os-hide-server-addresses/servers-list-resp.json +++ b/doc/api_samples/os-hide-server-addresses/servers-list-resp.json @@ -4,11 +4,11 @@ "id": "b2a7068b-8aed-41a4-aa74-af8feb984bae", "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/b2a7068b-8aed-41a4-aa74-af8feb984bae", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/b2a7068b-8aed-41a4-aa74-af8feb984bae", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/b2a7068b-8aed-41a4-aa74-af8feb984bae", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/b2a7068b-8aed-41a4-aa74-af8feb984bae", "rel": "bookmark" } ], diff --git a/doc/api_samples/os-migrations/v2.23/migrations-get.json b/doc/api_samples/os-migrations/v2.23/migrations-get.json index ece3ac6eaf..9c5deb16e7 100644 --- a/doc/api_samples/os-migrations/v2.23/migrations-get.json +++ b/doc/api_samples/os-migrations/v2.23/migrations-get.json @@ -9,11 +9,11 @@ "instance_uuid": "8600d31b-d1a1-4632-b2ff-45c2be1a70ff", "links": [ { - "href": "http://openstack.example.com/v2.1/openstack/servers/8600d31b-d1a1-4632-b2ff-45c2be1a70ff/migrations/1", + "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/servers/8600d31b-d1a1-4632-b2ff-45c2be1a70ff/migrations/1", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/8600d31b-d1a1-4632-b2ff-45c2be1a70ff/migrations/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/8600d31b-d1a1-4632-b2ff-45c2be1a70ff/migrations/1", "rel": "bookmark" } ], diff --git a/doc/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json b/doc/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json index ef38fbdbc8..e99905807d 100644 --- a/doc/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json +++ b/doc/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json @@ -4,11 +4,11 @@ "id": "440cf918-3ee0-4143-b289-f63e1d2000e6", "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/440cf918-3ee0-4143-b289-f63e1d2000e6", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/440cf918-3ee0-4143-b289-f63e1d2000e6", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/440cf918-3ee0-4143-b289-f63e1d2000e6", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/440cf918-3ee0-4143-b289-f63e1d2000e6", "rel": "bookmark" } ] diff --git a/doc/api_samples/os-pci/server-get-resp.json b/doc/api_samples/os-pci/server-get-resp.json index 58e1fdc77d..9f710e8ab6 100644 --- a/doc/api_samples/os-pci/server-get-resp.json +++ b/doc/api_samples/os-pci/server-get-resp.json @@ -53,7 +53,7 @@ ], "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-11-25T03:45:54Z", "user_id": "fake" } diff --git a/doc/api_samples/os-pci/servers-detail-resp.json b/doc/api_samples/os-pci/servers-detail-resp.json index e14839f8f3..3e149f1ced 100644 --- a/doc/api_samples/os-pci/servers-detail-resp.json +++ b/doc/api_samples/os-pci/servers-detail-resp.json @@ -54,7 +54,7 @@ ], "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-11-25T03:45:54Z", "user_id": "fake" } diff --git a/doc/api_samples/os-personality/server-action-rebuild-resp.json b/doc/api_samples/os-personality/server-action-rebuild-resp.json index 360ef1d056..b8888206e0 100644 --- a/doc/api_samples/os-personality/server-action-rebuild-resp.json +++ b/doc/api_samples/os-personality/server-action-rebuild-resp.json @@ -16,7 +16,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -27,18 +27,18 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] }, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/53a63a19-c145-47f8-9ae5-b39d6bff33ec", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/53a63a19-c145-47f8-9ae5-b39d6bff33ec", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/53a63a19-c145-47f8-9ae5-b39d6bff33ec", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/53a63a19-c145-47f8-9ae5-b39d6bff33ec", "rel": "bookmark" } ], @@ -48,7 +48,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-11-06T07:51:11Z", "user_id": "fake" } diff --git a/doc/api_samples/os-personality/server-post-resp.json b/doc/api_samples/os-personality/server-post-resp.json index 6008e075b4..9c31e93c9a 100644 --- a/doc/api_samples/os-personality/server-post-resp.json +++ b/doc/api_samples/os-personality/server-post-resp.json @@ -4,11 +4,11 @@ "id": "934760e1-2b0b-4f9e-a916-eac1e69839dc", "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/934760e1-2b0b-4f9e-a916-eac1e69839dc", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/934760e1-2b0b-4f9e-a916-eac1e69839dc", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/934760e1-2b0b-4f9e-a916-eac1e69839dc", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/934760e1-2b0b-4f9e-a916-eac1e69839dc", "rel": "bookmark" } ] diff --git a/doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json b/doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json index f8098e8b9d..8ca9c86d69 100644 --- a/doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json +++ b/doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json @@ -16,7 +16,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -27,18 +27,18 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] }, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/810e78d5-47fe-48bf-9559-bfe5dc918685", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/810e78d5-47fe-48bf-9559-bfe5dc918685", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/810e78d5-47fe-48bf-9559-bfe5dc918685", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/810e78d5-47fe-48bf-9559-bfe5dc918685", "rel": "bookmark" } ], @@ -48,7 +48,7 @@ "name": "foobar", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-12-30T12:28:15Z", "user_id": "fake" } diff --git a/doc/api_samples/os-rescue/server-get-resp-rescue.json b/doc/api_samples/os-rescue/server-get-resp-rescue.json index 3767a7b85a..1f0c426789 100644 --- a/doc/api_samples/os-rescue/server-get-resp-rescue.json +++ b/doc/api_samples/os-rescue/server-get-resp-rescue.json @@ -17,7 +17,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -28,7 +28,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -36,11 +36,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/2fd0c66b-50af-41d2-9253-9fa41e7e8dd8", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/2fd0c66b-50af-41d2-9253-9fa41e7e8dd8", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/2fd0c66b-50af-41d2-9253-9fa41e7e8dd8", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/2fd0c66b-50af-41d2-9253-9fa41e7e8dd8", "rel": "bookmark" } ], @@ -49,7 +49,7 @@ }, "name": "new-server-test", "status": "RESCUE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-18T07:22:11Z", "user_id": "fake" } diff --git a/doc/api_samples/os-rescue/server-get-resp-unrescue.json b/doc/api_samples/os-rescue/server-get-resp-unrescue.json index 7abb520053..9e9c1d5ed0 100644 --- a/doc/api_samples/os-rescue/server-get-resp-unrescue.json +++ b/doc/api_samples/os-rescue/server-get-resp-unrescue.json @@ -17,7 +17,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -28,7 +28,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -36,11 +36,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/edfc3905-1f3c-4819-8fc3-a7d8131cfa22", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/edfc3905-1f3c-4819-8fc3-a7d8131cfa22", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/edfc3905-1f3c-4819-8fc3-a7d8131cfa22", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/edfc3905-1f3c-4819-8fc3-a7d8131cfa22", "rel": "bookmark" } ], @@ -50,7 +50,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-18T07:22:12Z", "user_id": "fake" } diff --git a/doc/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json b/doc/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json index ecc3ecb635..13471f6138 100644 --- a/doc/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json +++ b/doc/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json @@ -4,11 +4,11 @@ "id": "4c8b1df3-46f7-4555-98d8-cdb869aaf9ad", "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/4c8b1df3-46f7-4555-98d8-cdb869aaf9ad", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/4c8b1df3-46f7-4555-98d8-cdb869aaf9ad", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/4c8b1df3-46f7-4555-98d8-cdb869aaf9ad", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/4c8b1df3-46f7-4555-98d8-cdb869aaf9ad", "rel": "bookmark" } ] diff --git a/doc/api_samples/os-security-groups/security-groups-create-resp.json b/doc/api_samples/os-security-groups/security-groups-create-resp.json index 1b134d7908..52235062f3 100644 --- a/doc/api_samples/os-security-groups/security-groups-create-resp.json +++ b/doc/api_samples/os-security-groups/security-groups-create-resp.json @@ -4,6 +4,6 @@ "id": 1, "name": "default", "rules": [], - "tenant_id": "openstack" + "tenant_id": "6f70656e737461636b20342065766572" } } \ No newline at end of file diff --git a/doc/api_samples/os-security-groups/security-groups-get-resp.json b/doc/api_samples/os-security-groups/security-groups-get-resp.json index 1b134d7908..52235062f3 100644 --- a/doc/api_samples/os-security-groups/security-groups-get-resp.json +++ b/doc/api_samples/os-security-groups/security-groups-get-resp.json @@ -4,6 +4,6 @@ "id": 1, "name": "default", "rules": [], - "tenant_id": "openstack" + "tenant_id": "6f70656e737461636b20342065766572" } } \ No newline at end of file diff --git a/doc/api_samples/os-security-groups/security-groups-list-get-resp.json b/doc/api_samples/os-security-groups/security-groups-list-get-resp.json index a5c33e6995..d4b225ac45 100644 --- a/doc/api_samples/os-security-groups/security-groups-list-get-resp.json +++ b/doc/api_samples/os-security-groups/security-groups-list-get-resp.json @@ -5,7 +5,7 @@ "id": 1, "name": "default", "rules": [], - "tenant_id": "openstack" + "tenant_id": "6f70656e737461636b20342065766572" } ] } \ No newline at end of file diff --git a/doc/api_samples/os-security-groups/server-get-resp.json b/doc/api_samples/os-security-groups/server-get-resp.json index 4de50a1850..74734e9a52 100644 --- a/doc/api_samples/os-security-groups/server-get-resp.json +++ b/doc/api_samples/os-security-groups/server-get-resp.json @@ -17,7 +17,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -28,7 +28,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -36,11 +36,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/b08eb8d8-db43-44fb-bd89-dfe3302b84ef", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/b08eb8d8-db43-44fb-bd89-dfe3302b84ef", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/b08eb8d8-db43-44fb-bd89-dfe3302b84ef", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/b08eb8d8-db43-44fb-bd89-dfe3302b84ef", "rel": "bookmark" } ], @@ -55,7 +55,7 @@ } ], "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2014-09-18T10:13:34Z", "user_id": "fake" } diff --git a/doc/api_samples/os-security-groups/server-post-resp.json b/doc/api_samples/os-security-groups/server-post-resp.json index 4d14999ef2..b276c8211e 100644 --- a/doc/api_samples/os-security-groups/server-post-resp.json +++ b/doc/api_samples/os-security-groups/server-post-resp.json @@ -4,11 +4,11 @@ "id": "60874907-c72b-4a01-805d-54c992510e47", "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/60874907-c72b-4a01-805d-54c992510e47", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/60874907-c72b-4a01-805d-54c992510e47", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/60874907-c72b-4a01-805d-54c992510e47", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/60874907-c72b-4a01-805d-54c992510e47", "rel": "bookmark" } ], diff --git a/doc/api_samples/os-security-groups/server-security-groups-list-resp.json b/doc/api_samples/os-security-groups/server-security-groups-list-resp.json index a5c33e6995..d4b225ac45 100644 --- a/doc/api_samples/os-security-groups/server-security-groups-list-resp.json +++ b/doc/api_samples/os-security-groups/server-security-groups-list-resp.json @@ -5,7 +5,7 @@ "id": 1, "name": "default", "rules": [], - "tenant_id": "openstack" + "tenant_id": "6f70656e737461636b20342065766572" } ] } \ No newline at end of file diff --git a/doc/api_samples/os-security-groups/servers-detail-resp.json b/doc/api_samples/os-security-groups/servers-detail-resp.json index 86f75dc7da..71b75c82c8 100644 --- a/doc/api_samples/os-security-groups/servers-detail-resp.json +++ b/doc/api_samples/os-security-groups/servers-detail-resp.json @@ -18,7 +18,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -29,7 +29,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -37,11 +37,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/d182742c-6f20-479c-8e32-f79f9c9df6e3", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/d182742c-6f20-479c-8e32-f79f9c9df6e3", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/d182742c-6f20-479c-8e32-f79f9c9df6e3", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/d182742c-6f20-479c-8e32-f79f9c9df6e3", "rel": "bookmark" } ], @@ -56,7 +56,7 @@ } ], "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2014-09-18T10:13:34Z", "user_id": "fake" } diff --git a/doc/api_samples/os-server-groups/v2.13/server-groups-get-resp.json b/doc/api_samples/os-server-groups/v2.13/server-groups-get-resp.json index 4f9e2248fc..fbd57081ae 100644 --- a/doc/api_samples/os-server-groups/v2.13/server-groups-get-resp.json +++ b/doc/api_samples/os-server-groups/v2.13/server-groups-get-resp.json @@ -5,7 +5,7 @@ "policies": ["anti-affinity"], "members": [], "metadata": {}, - "project_id": "openstack", + "project_id": "6f70656e737461636b20342065766572", "user_id": "fake" } } diff --git a/doc/api_samples/os-server-groups/v2.13/server-groups-list-resp.json b/doc/api_samples/os-server-groups/v2.13/server-groups-list-resp.json index d330e4df46..4276cad19b 100644 --- a/doc/api_samples/os-server-groups/v2.13/server-groups-list-resp.json +++ b/doc/api_samples/os-server-groups/v2.13/server-groups-list-resp.json @@ -6,7 +6,7 @@ "policies": ["anti-affinity"], "members": [], "metadata": {}, - "project_id": "openstack", + "project_id": "6f70656e737461636b20342065766572", "user_id": "fake" } ] diff --git a/doc/api_samples/os-server-groups/v2.13/server-groups-post-resp.json b/doc/api_samples/os-server-groups/v2.13/server-groups-post-resp.json index 4f9e2248fc..fbd57081ae 100644 --- a/doc/api_samples/os-server-groups/v2.13/server-groups-post-resp.json +++ b/doc/api_samples/os-server-groups/v2.13/server-groups-post-resp.json @@ -5,7 +5,7 @@ "policies": ["anti-affinity"], "members": [], "metadata": {}, - "project_id": "openstack", + "project_id": "6f70656e737461636b20342065766572", "user_id": "fake" } } diff --git a/doc/api_samples/os-server-usage/server-get-resp.json b/doc/api_samples/os-server-usage/server-get-resp.json index ea59cb496a..57ccf0c1d0 100644 --- a/doc/api_samples/os-server-usage/server-get-resp.json +++ b/doc/api_samples/os-server-usage/server-get-resp.json @@ -17,7 +17,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -28,7 +28,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -36,11 +36,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/cee6d136-e378-4cfc-9eec-71797f025991", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/cee6d136-e378-4cfc-9eec-71797f025991", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/cee6d136-e378-4cfc-9eec-71797f025991", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/cee6d136-e378-4cfc-9eec-71797f025991", "rel": "bookmark" } ], @@ -52,7 +52,7 @@ "OS-SRV-USG:terminated_at": null, "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-08-15T08:12:40Z", "user_id": "fake" } diff --git a/doc/api_samples/os-server-usage/servers-detail-resp.json b/doc/api_samples/os-server-usage/servers-detail-resp.json index d0f0d5d26a..a57d5ed01b 100644 --- a/doc/api_samples/os-server-usage/servers-detail-resp.json +++ b/doc/api_samples/os-server-usage/servers-detail-resp.json @@ -18,7 +18,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -29,7 +29,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -37,11 +37,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/ae114799-9164-48f5-a036-6ef9310acbc4", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/ae114799-9164-48f5-a036-6ef9310acbc4", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/ae114799-9164-48f5-a036-6ef9310acbc4", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/ae114799-9164-48f5-a036-6ef9310acbc4", "rel": "bookmark" } ], @@ -53,7 +53,7 @@ "OS-SRV-USG:terminated_at": null, "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-08-15T12:04:05Z", "user_id": "fake" } diff --git a/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json b/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json index 6ab0e1fd5f..99ee847c4a 100644 --- a/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json +++ b/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json @@ -11,14 +11,14 @@ "name": "new-server-test", "started_at": "2012-10-08T20:10:44.541277", "state": "active", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "uptime": 3600, "vcpus": 1 } ], "start": "2012-10-08T20:10:44.587336", "stop": "2012-10-08T21:10:44.587336", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "total_hours": 1.0, "total_local_gb_usage": 1.0, "total_memory_mb_usage": 512.0, diff --git a/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json b/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json index ba45c4b5cf..9d79753006 100644 --- a/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json +++ b/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json @@ -3,7 +3,7 @@ { "start": "2012-10-08T21:10:44.587336", "stop": "2012-10-08T22:10:44.587336", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "total_hours": 1.0, "total_local_gb_usage": 1.0, "total_memory_mb_usage": 512.0, diff --git a/doc/api_samples/os-user-data/userdata-post-resp.json b/doc/api_samples/os-user-data/userdata-post-resp.json index 1022af2888..1e14966de1 100644 --- a/doc/api_samples/os-user-data/userdata-post-resp.json +++ b/doc/api_samples/os-user-data/userdata-post-resp.json @@ -4,11 +4,11 @@ "id": "976a62bb-0d4a-4e17-9044-1864e888a557", "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/976a62bb-0d4a-4e17-9044-1864e888a557", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/976a62bb-0d4a-4e17-9044-1864e888a557", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/976a62bb-0d4a-4e17-9044-1864e888a557", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/976a62bb-0d4a-4e17-9044-1864e888a557", "rel": "bookmark" } ] diff --git a/doc/api_samples/servers-sort/server-sort-keys-list-resp.json b/doc/api_samples/servers-sort/server-sort-keys-list-resp.json index 2b8e5055d0..b6307dfc8f 100644 --- a/doc/api_samples/servers-sort/server-sort-keys-list-resp.json +++ b/doc/api_samples/servers-sort/server-sort-keys-list-resp.json @@ -4,11 +4,11 @@ "id": "e08e6d34-fcc1-480e-b11e-24a675b479f8", "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/e08e6d34-fcc1-480e-b11e-24a675b479f8", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/e08e6d34-fcc1-480e-b11e-24a675b479f8", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/e08e6d34-fcc1-480e-b11e-24a675b479f8", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/e08e6d34-fcc1-480e-b11e-24a675b479f8", "rel": "bookmark" } ], diff --git a/doc/api_samples/servers/server-action-rebuild-resp.json b/doc/api_samples/servers/server-action-rebuild-resp.json index fd4c1311c7..b4ce48c900 100644 --- a/doc/api_samples/servers/server-action-rebuild-resp.json +++ b/doc/api_samples/servers/server-action-rebuild-resp.json @@ -16,7 +16,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -27,18 +27,18 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] }, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/a0a80a94-3d81-4a10-822a-daa0cf9e870b", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/a0a80a94-3d81-4a10-822a-daa0cf9e870b", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/a0a80a94-3d81-4a10-822a-daa0cf9e870b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/a0a80a94-3d81-4a10-822a-daa0cf9e870b", "rel": "bookmark" } ], @@ -48,7 +48,7 @@ "name": "foobar", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-11-14T06:29:02Z", "user_id": "fake" } diff --git a/doc/api_samples/servers/server-create-resp.json b/doc/api_samples/servers/server-create-resp.json index c60685f4a8..f50e29dd8b 100644 --- a/doc/api_samples/servers/server-create-resp.json +++ b/doc/api_samples/servers/server-create-resp.json @@ -5,11 +5,11 @@ "id": "f5dc173b-6804-445a-a6d8-c705dad5b5eb", "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", "rel": "bookmark" } ], diff --git a/doc/api_samples/servers/server-get-resp.json b/doc/api_samples/servers/server-get-resp.json index 5d84a9ff05..af6297d972 100644 --- a/doc/api_samples/servers/server-get-resp.json +++ b/doc/api_samples/servers/server-get-resp.json @@ -17,7 +17,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -28,7 +28,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -36,11 +36,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/0e44cc9c-e052-415d-afbf-469b0d384170", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/0e44cc9c-e052-415d-afbf-469b0d384170", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/0e44cc9c-e052-415d-afbf-469b0d384170", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/0e44cc9c-e052-415d-afbf-469b0d384170", "rel": "bookmark" } ], @@ -50,7 +50,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-03T04:01:33Z", "user_id": "fake" } diff --git a/doc/api_samples/servers/server-post-resp.json b/doc/api_samples/servers/server-post-resp.json index 2893e08544..9c3ad3d8c8 100644 --- a/doc/api_samples/servers/server-post-resp.json +++ b/doc/api_samples/servers/server-post-resp.json @@ -4,11 +4,11 @@ "id": "f5dc173b-6804-445a-a6d8-c705dad5b5eb", "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", "rel": "bookmark" } ] diff --git a/doc/api_samples/servers/server-update-resp.json b/doc/api_samples/servers/server-update-resp.json index 11496a66e6..4607e312f2 100644 --- a/doc/api_samples/servers/server-update-resp.json +++ b/doc/api_samples/servers/server-update-resp.json @@ -16,7 +16,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -27,18 +27,18 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] }, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/324dfb7d-f4a9-419a-9a19-237df04b443b", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/324dfb7d-f4a9-419a-9a19-237df04b443b", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/324dfb7d-f4a9-419a-9a19-237df04b443b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/324dfb7d-f4a9-419a-9a19-237df04b443b", "rel": "bookmark" } ], @@ -48,7 +48,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2012-12-02T02:11:58Z", "user_id": "fake" } diff --git a/doc/api_samples/servers/servers-details-resp.json b/doc/api_samples/servers/servers-details-resp.json index 5ffcb1a748..bb374b9417 100644 --- a/doc/api_samples/servers/servers-details-resp.json +++ b/doc/api_samples/servers/servers-details-resp.json @@ -18,7 +18,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -29,7 +29,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -37,11 +37,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", "rel": "bookmark" } ], @@ -51,7 +51,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-03T04:01:32Z", "user_id": "fake" } diff --git a/doc/api_samples/servers/servers-list-resp.json b/doc/api_samples/servers/servers-list-resp.json index 24fcf37623..f4b2ce3802 100644 --- a/doc/api_samples/servers/servers-list-resp.json +++ b/doc/api_samples/servers/servers-list-resp.json @@ -4,11 +4,11 @@ "id": "22c91117-08de-4894-9aa9-6ef382400985", "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/22c91117-08de-4894-9aa9-6ef382400985", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/22c91117-08de-4894-9aa9-6ef382400985", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/22c91117-08de-4894-9aa9-6ef382400985", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/22c91117-08de-4894-9aa9-6ef382400985", "rel": "bookmark" } ], diff --git a/doc/api_samples/servers/v2.16/server-get-resp.json b/doc/api_samples/servers/v2.16/server-get-resp.json index 7b09e16463..ee500305c2 100644 --- a/doc/api_samples/servers/v2.16/server-get-resp.json +++ b/doc/api_samples/servers/v2.16/server-get-resp.json @@ -17,7 +17,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -28,7 +28,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -36,11 +36,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/0e44cc9c-e052-415d-afbf-469b0d384170", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/0e44cc9c-e052-415d-afbf-469b0d384170", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/0e44cc9c-e052-415d-afbf-469b0d384170", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/0e44cc9c-e052-415d-afbf-469b0d384170", "rel": "bookmark" } ], @@ -51,7 +51,7 @@ "progress": 0, "status": "ACTIVE", "host_status": "UP", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-03T04:01:33Z", "user_id": "fake" } diff --git a/doc/api_samples/servers/v2.16/servers-details-resp.json b/doc/api_samples/servers/v2.16/servers-details-resp.json index 5256384042..2b24f82b46 100644 --- a/doc/api_samples/servers/v2.16/servers-details-resp.json +++ b/doc/api_samples/servers/v2.16/servers-details-resp.json @@ -18,7 +18,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -29,7 +29,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -37,11 +37,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", "rel": "bookmark" } ], @@ -52,7 +52,7 @@ "progress": 0, "status": "ACTIVE", "host_status": "UP", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-03T04:01:32Z", "user_id": "fake" } diff --git a/doc/api_samples/servers/v2.19/server-action-rebuild-resp.json b/doc/api_samples/servers/v2.19/server-action-rebuild-resp.json index bf182c5fa1..e17d95274c 100644 --- a/doc/api_samples/servers/v2.19/server-action-rebuild-resp.json +++ b/doc/api_samples/servers/v2.19/server-action-rebuild-resp.json @@ -16,7 +16,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -27,18 +27,18 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] }, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/a0a80a94-3d81-4a10-822a-daa0cf9e870b", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/a0a80a94-3d81-4a10-822a-daa0cf9e870b", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/a0a80a94-3d81-4a10-822a-daa0cf9e870b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/a0a80a94-3d81-4a10-822a-daa0cf9e870b", "rel": "bookmark" } ], @@ -50,7 +50,7 @@ "description" : "description of foobar", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-11-14T06:29:02Z", "user_id": "fake" } diff --git a/doc/api_samples/servers/v2.19/server-get-resp.json b/doc/api_samples/servers/v2.19/server-get-resp.json index 8acab59366..7ff8aaeba0 100644 --- a/doc/api_samples/servers/v2.19/server-get-resp.json +++ b/doc/api_samples/servers/v2.19/server-get-resp.json @@ -18,7 +18,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -29,7 +29,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -37,11 +37,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/ddb205dc-717e-496e-8e96-88a3b31b075d", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/ddb205dc-717e-496e-8e96-88a3b31b075d", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/ddb205dc-717e-496e-8e96-88a3b31b075d", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/ddb205dc-717e-496e-8e96-88a3b31b075d", "rel": "bookmark" } ], @@ -52,7 +52,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2015-12-07T17:24:15Z", "user_id": "fake" } diff --git a/doc/api_samples/servers/v2.19/server-post-resp.json b/doc/api_samples/servers/v2.19/server-post-resp.json index 5994b55f6c..c5b9bc685e 100644 --- a/doc/api_samples/servers/v2.19/server-post-resp.json +++ b/doc/api_samples/servers/v2.19/server-post-resp.json @@ -4,11 +4,11 @@ "id": "19923676-e78b-46fb-af62-a5942aece2ac", "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/19923676-e78b-46fb-af62-a5942aece2ac", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/19923676-e78b-46fb-af62-a5942aece2ac", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/19923676-e78b-46fb-af62-a5942aece2ac", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/19923676-e78b-46fb-af62-a5942aece2ac", "rel": "bookmark" } ] diff --git a/doc/api_samples/servers/v2.19/server-put-resp.json b/doc/api_samples/servers/v2.19/server-put-resp.json index 79c57982fa..91c2f3cd08 100644 --- a/doc/api_samples/servers/v2.19/server-put-resp.json +++ b/doc/api_samples/servers/v2.19/server-put-resp.json @@ -16,7 +16,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -27,18 +27,18 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] }, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/c509708e-f0c6-461f-b2b3-507547959eb2", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/c509708e-f0c6-461f-b2b3-507547959eb2", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/c509708e-f0c6-461f-b2b3-507547959eb2", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/c509708e-f0c6-461f-b2b3-507547959eb2", "rel": "bookmark" } ], @@ -49,7 +49,7 @@ "name": "updated-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2015-12-07T19:19:36Z", "user_id": "fake" } diff --git a/doc/api_samples/servers/v2.19/servers-details-resp.json b/doc/api_samples/servers/v2.19/servers-details-resp.json index 3f1a38c919..18dc0d6530 100644 --- a/doc/api_samples/servers/v2.19/servers-details-resp.json +++ b/doc/api_samples/servers/v2.19/servers-details-resp.json @@ -19,7 +19,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -30,7 +30,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -38,11 +38,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/91965362-fd86-4543-8ce1-c17074d2984d", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/91965362-fd86-4543-8ce1-c17074d2984d", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/91965362-fd86-4543-8ce1-c17074d2984d", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/91965362-fd86-4543-8ce1-c17074d2984d", "rel": "bookmark" } ], @@ -53,7 +53,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2015-12-07T19:54:49Z", "user_id": "fake" } diff --git a/doc/api_samples/servers/v2.19/servers-list-resp.json b/doc/api_samples/servers/v2.19/servers-list-resp.json index ffaccb8a7c..60a707fb45 100644 --- a/doc/api_samples/servers/v2.19/servers-list-resp.json +++ b/doc/api_samples/servers/v2.19/servers-list-resp.json @@ -4,11 +4,11 @@ "id": "78d95942-8805-4597-b1af-3d0e38330758", "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/78d95942-8805-4597-b1af-3d0e38330758", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/78d95942-8805-4597-b1af-3d0e38330758", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/78d95942-8805-4597-b1af-3d0e38330758", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/78d95942-8805-4597-b1af-3d0e38330758", "rel": "bookmark" } ], diff --git a/doc/api_samples/servers/v2.9/server-get-resp.json b/doc/api_samples/servers/v2.9/server-get-resp.json index 7e7c980fa3..cbd4336469 100644 --- a/doc/api_samples/servers/v2.9/server-get-resp.json +++ b/doc/api_samples/servers/v2.9/server-get-resp.json @@ -17,7 +17,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -28,7 +28,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -36,11 +36,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/0e44cc9c-e052-415d-afbf-469b0d384170", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/0e44cc9c-e052-415d-afbf-469b0d384170", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/0e44cc9c-e052-415d-afbf-469b0d384170", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/0e44cc9c-e052-415d-afbf-469b0d384170", "rel": "bookmark" } ], @@ -50,7 +50,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-03T04:01:33Z", "user_id": "fake", "locked": false diff --git a/doc/api_samples/servers/v2.9/servers-details-resp.json b/doc/api_samples/servers/v2.9/servers-details-resp.json index b141906cc9..44bfad504d 100644 --- a/doc/api_samples/servers/v2.9/servers-details-resp.json +++ b/doc/api_samples/servers/v2.9/servers-details-resp.json @@ -18,7 +18,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", "rel": "bookmark" } ] @@ -29,7 +29,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -37,11 +37,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", "rel": "bookmark" } ], @@ -51,7 +51,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-03T04:01:32Z", "user_id": "fake", "locked": false diff --git a/doc/api_samples/servers/v2.9/servers-list-resp.json b/doc/api_samples/servers/v2.9/servers-list-resp.json index 24fcf37623..f4b2ce3802 100644 --- a/doc/api_samples/servers/v2.9/servers-list-resp.json +++ b/doc/api_samples/servers/v2.9/servers-list-resp.json @@ -4,11 +4,11 @@ "id": "22c91117-08de-4894-9aa9-6ef382400985", "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/22c91117-08de-4894-9aa9-6ef382400985", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/22c91117-08de-4894-9aa9-6ef382400985", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/22c91117-08de-4894-9aa9-6ef382400985", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/22c91117-08de-4894-9aa9-6ef382400985", "rel": "bookmark" } ], diff --git a/nova/tests/fixtures.py b/nova/tests/fixtures.py index e330cfe0a7..8e73557471 100644 --- a/nova/tests/fixtures.py +++ b/nova/tests/fixtures.py @@ -336,7 +336,8 @@ class OSAPIFixture(fixtures.Fixture): """ - def __init__(self, api_version='v2', project_id='openstack'): + def __init__(self, api_version='v2', + project_id='6f70656e737461636b20342065766572'): """Constructor :param api_version: the API version that we're interested in diff --git a/nova/tests/functional/api/client.py b/nova/tests/functional/api/client.py index fe888148bd..8496162d52 100644 --- a/nova/tests/functional/api/client.py +++ b/nova/tests/functional/api/client.py @@ -117,13 +117,16 @@ class TestOpenStackClient(object): """ def __init__(self, auth_user, auth_key, auth_uri, - project_id='openstack'): + project_id=None): super(TestOpenStackClient, self).__init__() self.auth_result = None self.auth_user = auth_user self.auth_key = auth_key self.auth_uri = auth_uri - self.project_id = project_id + if project_id is None: + self.project_id = "6f70656e737461636b20342065766572" + else: + self.project_id = project_id self.microversion = None def request(self, url, method='GET', body=None, headers=None): diff --git a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-rebuild-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-rebuild-resp.json.tpl index b1e61d2bcc..5a54ccd347 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-rebuild-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-rebuild-resp.json.tpl @@ -49,7 +49,7 @@ "name": "%(name)s", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake" } diff --git a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-get-resp.json.tpl index 25861299bb..e261f4a95f 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-get-resp.json.tpl @@ -67,7 +67,7 @@ } ], "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake" } diff --git a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/servers-details-resp.json.tpl index c4fce6bbb0..6dddb52cac 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/servers-details-resp.json.tpl @@ -68,7 +68,7 @@ } ], "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake" } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl index 1c416d28eb..19368fb609 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl @@ -46,7 +46,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake", "accessIPv4": "%(access_ip_v4)s", diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-get-resp.json.tpl index 6344fcb394..a090795d08 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-get-resp.json.tpl @@ -49,7 +49,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake", "key_name": null diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/servers-details-resp.json.tpl index ffa7c13a3f..f3e5f52526 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/servers-details-resp.json.tpl @@ -50,7 +50,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake", "key_name": null diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl index 0253317ec9..165e7a1e60 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl @@ -50,7 +50,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake", "key_name": null diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl index b5daa3e57f..a244eb9f46 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl @@ -51,7 +51,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake", "key_name": null diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/list-servers-detail-get.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/list-servers-detail-get.json.tpl index 3b447dee72..abd8ff87b9 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/list-servers-detail-get.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/list-servers-detail-get.json.tpl @@ -51,7 +51,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "key_name": null, "user_id": "fake" diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-action-rebuild-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-action-rebuild-resp.json.tpl index dcd1aecced..ae262efd16 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-action-rebuild-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-action-rebuild-resp.json.tpl @@ -49,7 +49,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake" } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-get-resp.json.tpl index 0eb9126e00..a224d3a94a 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-get-resp.json.tpl @@ -50,7 +50,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "key_name": null, "user_id": "fake" diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-extended-availability-zone/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-extended-availability-zone/server-get-resp.json.tpl index 5bb615d639..e7eebb11a6 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-extended-availability-zone/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-extended-availability-zone/server-get-resp.json.tpl @@ -51,7 +51,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "user_id": "fake", "key_name": null } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-extended-availability-zone/servers-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-extended-availability-zone/servers-detail-resp.json.tpl index a8923ae4b3..f9748ad2d1 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-extended-availability-zone/servers-detail-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-extended-availability-zone/servers-detail-resp.json.tpl @@ -52,7 +52,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "user_id": "fake", "key_name": null } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/server-get-resp.json.tpl index cb64f7e164..8ea8ff196e 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/server-get-resp.json.tpl @@ -53,7 +53,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "user_id": "fake", "key_name": null } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl index 9d607e20a3..a52dafed75 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl @@ -54,7 +54,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "user_id": "fake", "key_name": null } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/v2.16/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/v2.16/server-get-resp.json.tpl index 5c1bd9f124..88a67dec5b 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/v2.16/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/v2.16/server-get-resp.json.tpl @@ -62,7 +62,7 @@ "progress": 0, "status": "ACTIVE", "host_status": "UP", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "user_id": "fake", "key_name": null } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/v2.16/servers-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/v2.16/servers-detail-resp.json.tpl index 4916d4f413..8135a40582 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/v2.16/servers-detail-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/v2.16/servers-detail-resp.json.tpl @@ -63,7 +63,7 @@ "progress": 0, "status": "ACTIVE", "host_status": "UP", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "user_id": "fake", "key_name": null } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-extended-status/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-extended-status/server-get-resp.json.tpl index 337fb962e9..95a53548f9 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-extended-status/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-extended-status/server-get-resp.json.tpl @@ -53,7 +53,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "user_id": "fake", "key_name": null } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-extended-status/servers-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-extended-status/servers-detail-resp.json.tpl index f83220df2f..21b316a3ce 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-extended-status/servers-detail-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-extended-status/servers-detail-resp.json.tpl @@ -54,7 +54,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "user_id": "fake", "key_name": null }] diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-extended-volumes/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-extended-volumes/server-get-resp.json.tpl index 343bc1a2b1..8d2ed19396 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-extended-volumes/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-extended-volumes/server-get-resp.json.tpl @@ -49,7 +49,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake", "os-extended-volumes:volumes_attached": [ diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-extended-volumes/servers-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-extended-volumes/servers-detail-resp.json.tpl index 41e2c5eb9f..a0d80bb389 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-extended-volumes/servers-detail-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-extended-volumes/servers-detail-resp.json.tpl @@ -51,7 +51,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "user_id": "fake", "os-extended-volumes:volumes_attached": [ {"id": "volume_id1"}, diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-fping/fping-get-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-fping/fping-get-details-resp.json.tpl index f3b222c399..59953dbf03 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-fping/fping-get-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-fping/fping-get-details-resp.json.tpl @@ -2,6 +2,6 @@ "server": { "alive": false, "id": "%(uuid)s", - "project_id": "openstack" + "project_id": "6f70656e737461636b20342065766572" } } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-fping/fping-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-fping/fping-get-resp.json.tpl index b33e80668b..df03e5362a 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-fping/fping-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-fping/fping-get-resp.json.tpl @@ -3,7 +3,7 @@ { "alive": false, "id": "%(uuid)s", - "project_id": "openstack" + "project_id": "6f70656e737461636b20342065766572" } ] } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/server-get-resp.json.tpl index 7770af5c2c..9474dc1308 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/server-get-resp.json.tpl @@ -42,7 +42,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake" } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl index 53e0c63bf4..37a5454208 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl @@ -42,7 +42,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake" } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-migrations/v2.23/migrations-get.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-migrations/v2.23/migrations-get.json.tpl index 0251b1392a..932f8bb9af 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-migrations/v2.23/migrations-get.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-migrations/v2.23/migrations-get.json.tpl @@ -9,11 +9,11 @@ "instance_uuid": "%(instance_1)s", "links": [ { - "href": "%(host)s/v2.1/openstack/servers/%(instance_1)s/migrations/1", + "href": "%(host)s/v2.1/6f70656e737461636b20342065766572/servers/%(instance_1)s/migrations/1", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(instance_1)s/migrations/1", + "href": "%(host)s/6f70656e737461636b20342065766572/servers/%(instance_1)s/migrations/1", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-pci/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-pci/server-get-resp.json.tpl index b94f013f28..c9e314a7ef 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-pci/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-pci/server-get-resp.json.tpl @@ -53,7 +53,7 @@ ], "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake" } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-pci/servers-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-pci/servers-detail-resp.json.tpl index d152ae31ec..9c84aaf84a 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-pci/servers-detail-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-pci/servers-detail-resp.json.tpl @@ -54,7 +54,7 @@ ], "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake" } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-action-rebuild-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-action-rebuild-resp.json.tpl index 03e2dca7e8..cfb6d567ee 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-action-rebuild-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-action-rebuild-resp.json.tpl @@ -48,7 +48,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake" } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json.tpl index 866e8c37f2..7d48368583 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json.tpl @@ -48,7 +48,7 @@ "name": "%(name)s", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake" } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-rescue.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-rescue.json.tpl index 68102dcb7d..cddcee9d4c 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-rescue.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-rescue.json.tpl @@ -48,7 +48,7 @@ }, "name": "new-server-test", "status": "%(status)s", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake", "key_name": null diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-unrescue.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-unrescue.json.tpl index 0af870336a..e25800f3ab 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-unrescue.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-unrescue.json.tpl @@ -49,7 +49,7 @@ "name": "new-server-test", "progress": 0, "status": "%(status)s", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake", "key_name": null diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/security-groups-create-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/security-groups-create-resp.json.tpl index e51714e3ee..13fd8e4d8f 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/security-groups-create-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/security-groups-create-resp.json.tpl @@ -4,6 +4,6 @@ "id": 1, "name": "%(group_name)s", "rules": [], - "tenant_id": "openstack" + "tenant_id": "6f70656e737461636b20342065766572" } } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/security-groups-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/security-groups-get-resp.json.tpl index 0372512744..e0ccd183a3 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/security-groups-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/security-groups-get-resp.json.tpl @@ -4,6 +4,6 @@ "id": 1, "name": "default", "rules": [], - "tenant_id": "openstack" + "tenant_id": "6f70656e737461636b20342065766572" } } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/security-groups-list-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/security-groups-list-get-resp.json.tpl index 1771f2dff1..0a3f1b21de 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/security-groups-list-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/security-groups-list-get-resp.json.tpl @@ -5,7 +5,7 @@ "id": 1, "name": "default", "rules": [], - "tenant_id": "openstack" + "tenant_id": "6f70656e737461636b20342065766572" } ] } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-get-resp.json.tpl index 9e3c2bac86..83c62840b9 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-get-resp.json.tpl @@ -49,7 +49,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake", "security_groups": [{"name": "test"}], diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-security-groups-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-security-groups-list-resp.json.tpl index 1771f2dff1..0a3f1b21de 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-security-groups-list-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-security-groups-list-resp.json.tpl @@ -5,7 +5,7 @@ "id": 1, "name": "default", "rules": [], - "tenant_id": "openstack" + "tenant_id": "6f70656e737461636b20342065766572" } ] } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/servers-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/servers-detail-resp.json.tpl index f5f655a403..b7d2cead1e 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/servers-detail-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/servers-detail-resp.json.tpl @@ -51,7 +51,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "user_id": "fake", "security_groups": [{"name": "test"}], "key_name": null diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-server-groups/v2.13/server-groups-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-server-groups/v2.13/server-groups-get-resp.json.tpl index d72a5418a6..ce040323b5 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-server-groups/v2.13/server-groups-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-server-groups/v2.13/server-groups-get-resp.json.tpl @@ -5,7 +5,7 @@ "policies": ["anti-affinity"], "members": [], "metadata": {}, - "project_id": "openstack", + "project_id": "6f70656e737461636b20342065766572", "user_id": "fake" } } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-server-groups/v2.13/server-groups-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-server-groups/v2.13/server-groups-list-resp.json.tpl index 8312769412..b2961547cb 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-server-groups/v2.13/server-groups-list-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-server-groups/v2.13/server-groups-list-resp.json.tpl @@ -6,7 +6,7 @@ "policies": ["anti-affinity"], "members": [], "metadata": {}, - "project_id": "openstack", + "project_id": "6f70656e737461636b20342065766572", "user_id": "fake" } ] diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-server-groups/v2.13/server-groups-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-server-groups/v2.13/server-groups-post-resp.json.tpl index d72a5418a6..ce040323b5 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-server-groups/v2.13/server-groups-post-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-server-groups/v2.13/server-groups-post-resp.json.tpl @@ -5,7 +5,7 @@ "policies": ["anti-affinity"], "members": [], "metadata": {}, - "project_id": "openstack", + "project_id": "6f70656e737461636b20342065766572", "user_id": "fake" } } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-server-usage/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-server-usage/server-get-resp.json.tpl index e189c90058..2d940e7083 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-server-usage/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-server-usage/server-get-resp.json.tpl @@ -52,7 +52,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake" } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-server-usage/servers-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-server-usage/servers-detail-resp.json.tpl index 2dad91193a..2a10480534 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-server-usage/servers-detail-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-server-usage/servers-detail-resp.json.tpl @@ -41,7 +41,7 @@ }, "id": "%(uuid)s", "OS-SRV-USG:terminated_at": null, - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "progress": 0, "flavor": { "id": "1", diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl index f37083013d..7262c16ddf 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl @@ -11,14 +11,14 @@ "name": "new-server-test", "started_at": "%(strtime)s", "state": "active", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "uptime": 3600, "vcpus": 1 } ], "start": "%(strtime)s", "stop": "%(strtime)s", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "total_hours": 1.0, "total_local_gb_usage": 1.0, "total_memory_mb_usage": 512.0, diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl index 25b5ff2b84..d8452fd845 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl @@ -3,7 +3,7 @@ { "start": "%(strtime)s", "stop": "%(strtime)s", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "total_hours": 1.0, "total_local_gb_usage": 1.0, "total_memory_mb_usage": 512.0, diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/server-action-rebuild-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/server-action-rebuild-resp.json.tpl index 866e8c37f2..7d48368583 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/server-action-rebuild-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/server-action-rebuild-resp.json.tpl @@ -48,7 +48,7 @@ "name": "%(name)s", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake" } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/server-get-resp.json.tpl index 6079555d01..5fc328cee3 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/server-get-resp.json.tpl @@ -50,7 +50,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake" } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/server-update-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/server-update-resp.json.tpl index 7261c4bae5..a712dbfb94 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/server-update-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/server-update-resp.json.tpl @@ -48,7 +48,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake" } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/servers-details-resp.json.tpl index 1093ff1248..de4277d330 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/servers-details-resp.json.tpl @@ -51,7 +51,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake" } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-action-rebuild-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-action-rebuild-resp.json.tpl index e863676e7b..73fedda938 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-action-rebuild-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-action-rebuild-resp.json.tpl @@ -50,7 +50,7 @@ "description": "%(description)s", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake" } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-get-resp.json.tpl index e9830f6142..8fbb0f58a0 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-get-resp.json.tpl @@ -51,7 +51,7 @@ "description": "new-server-description", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake", "locked": false diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-put-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-put-resp.json.tpl index cd3aaed4b4..eea4e00d6e 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-put-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-put-resp.json.tpl @@ -48,7 +48,7 @@ "description": "updated-server-description", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake", "locked": false diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/servers-details-resp.json.tpl index 0594f7c81e..b300bbb4a8 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/servers-details-resp.json.tpl @@ -52,7 +52,7 @@ "description": "new-server-description", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake", "locked": false diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/server-get-resp.json.tpl index a99eb0c8bf..fa749326fc 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/server-get-resp.json.tpl @@ -50,7 +50,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake", "locked": false diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-details-resp.json.tpl index 19983856b7..554f5e3d28 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-details-resp.json.tpl @@ -51,7 +51,7 @@ "name": "new-server-test", "progress": 0, "status": "ACTIVE", - "tenant_id": "openstack", + "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake", "locked": false diff --git a/nova/tests/functional/api_sample_tests/test_fixed_ips.py b/nova/tests/functional/api_sample_tests/test_fixed_ips.py index 1ad6b7fc44..270c638323 100644 --- a/nova/tests/functional/api_sample_tests/test_fixed_ips.py +++ b/nova/tests/functional/api_sample_tests/test_fixed_ips.py @@ -40,7 +40,7 @@ class FixedIpTest(test_servers.ServersSampleBase): super(FixedIpTest, self).setUp() self.api.microversion = self.microversion instance = dict(test_utils.get_test_instance(), - hostname='openstack', host='host') + hostname='compute.host.pvt', host='host') fake_fixed_ips = [{'id': 1, 'address': '192.168.1.1', 'network_id': 1, @@ -103,7 +103,7 @@ class FixedIpTest(test_servers.ServersSampleBase): # Return data about the given fixed ip. response = self._do_get('os-fixed-ips/192.168.1.1') project = {'cidr': '192.168.1.0/24', - 'hostname': 'openstack', + 'hostname': 'compute.host.pvt', 'host': 'host', 'address': '192.168.1.1'} project.update(**kwargs) diff --git a/nova/tests/functional/api_sample_tests/test_security_groups.py b/nova/tests/functional/api_sample_tests/test_security_groups.py index 21e79de9b9..0e51f639b9 100644 --- a/nova/tests/functional/api_sample_tests/test_security_groups.py +++ b/nova/tests/functional/api_sample_tests/test_security_groups.py @@ -16,6 +16,7 @@ from oslo_config import cfg from nova.tests.functional.api_sample_tests import test_servers +import nova.tests.functional.api_samples_test_base as astb CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', @@ -27,7 +28,7 @@ def fake_get(*args, **kwargs): nova_group['id'] = 1 nova_group['description'] = 'default' nova_group['name'] = 'default' - nova_group['project_id'] = 'openstack' + nova_group['project_id'] = astb.PROJECT_ID nova_group['rules'] = [] return nova_group diff --git a/nova/tests/functional/api_sample_tests/test_simple_tenant_usage.py b/nova/tests/functional/api_sample_tests/test_simple_tenant_usage.py index ef8177a530..40bb350f11 100644 --- a/nova/tests/functional/api_sample_tests/test_simple_tenant_usage.py +++ b/nova/tests/functional/api_sample_tests/test_simple_tenant_usage.py @@ -19,6 +19,7 @@ from oslo_config import cfg from oslo_utils import timeutils from nova.tests.functional.api_sample_tests import test_servers +import nova.tests.functional.api_samples_test_base as astb CONF = cfg.CONF CONF.import_opt('osapi_compute_extension', @@ -65,7 +66,7 @@ class SimpleTenantUsageSampleJsonTest(test_servers.ServersSampleBase): def test_get_tenant_usage_details(self): # Get api sample to get specific tenant usage request. - tenant_id = 'openstack' + tenant_id = astb.PROJECT_ID response = self._do_get('os-simple-tenant-usage/%s?%s' % (tenant_id, urllib.urlencode(self.query))) self._verify_response('simple-tenant-usage-get-specific', {}, diff --git a/nova/tests/functional/api_samples_test_base.py b/nova/tests/functional/api_samples_test_base.py index 24070a1c99..f008d0cac7 100644 --- a/nova/tests/functional/api_samples_test_base.py +++ b/nova/tests/functional/api_samples_test_base.py @@ -22,6 +22,8 @@ import six from nova import test from nova.tests.functional import integrated_helpers +PROJECT_ID = "6f70656e737461636b20342065766572" + class NoMatch(test.TestingException): pass @@ -304,17 +306,17 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase): def _update_links(self, sample_data): """Process sample data and update version specific links.""" # replace version urls - url_re = self._get_host() + "/v(2|2\.1)/openstack" + url_re = self._get_host() + "/v(2|2\.1)/" + PROJECT_ID new_url = self._get_host() + "/" + self.api_major_version if self._project_id: - new_url += "/openstack" + new_url += "/" + PROJECT_ID updated_data = re.sub(url_re, new_url, sample_data) # replace unversioned urls - url_re = self._get_host() + "/openstack" + url_re = self._get_host() + "/" + PROJECT_ID new_url = self._get_host() if self._project_id: - new_url += "/openstack" + new_url += "/" + PROJECT_ID updated_data = re.sub(url_re, new_url, updated_data) return updated_data @@ -427,7 +429,7 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase): # NOTE(sdague): "openstack" is stand in for project_id, it # should be more generic in future. if self._project_id: - return '%s/%s' % (self._get_host(), 'openstack') + return '%s/%s' % (self._get_host(), PROJECT_ID) else: return self._get_host() @@ -436,7 +438,7 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase): # should be more generic in future. if self._project_id: return '%s/%s/%s' % (self._get_host(), self.api_major_version, - 'openstack') + PROJECT_ID) else: return '%s/%s' % (self._get_host(), self.api_major_version) diff --git a/nova/tests/functional/test_server_group.py b/nova/tests/functional/test_server_group.py index 12dbbf306e..91a0bb3783 100644 --- a/nova/tests/functional/test_server_group.py +++ b/nova/tests/functional/test_server_group.py @@ -31,6 +31,9 @@ import nova.tests.unit.image.fake CONF = cfg.CONF +# An alternate project id +PROJECT_ID_ALT = "616c6c796f7572626173656172656f73" + class ServerGroupTestBase(test.TestCase): REQUIRES_LOCKING = True @@ -203,7 +206,7 @@ class ServerGroupTestV2(ServerGroupTestBase): # additional API server. Should be addressed in the future. api_openstack1 = self.useFixture(nova_fixtures.OSAPIFixture( api_version=self.api_major_version, - project_id='openstack1')).api + project_id=PROJECT_ID_ALT)).api api_openstack1.microversion = self.microversion # Create a server group in project 'openstack' diff --git a/nova/tests/unit/api_samples_test_base/test_compare_result.py b/nova/tests/unit/api_samples_test_base/test_compare_result.py index c1ab0b8b54..bb5356aa13 100644 --- a/nova/tests/unit/api_samples_test_base/test_compare_result.py +++ b/nova/tests/unit/api_samples_test_base/test_compare_result.py @@ -279,14 +279,18 @@ class TestCompareResult(test.NoDBTestCase): [ { u'href': - (u'http://openstack.example.com/v2/openstack/server/' - '858f295a-8543-45fa-804a-08f8356d616d'), + (u'http://openstack.example.com/v2/%s/server/' + '858f295a-8543-45fa-804a-08f8356d616d' % + api_samples_test_base.PROJECT_ID + ), u'rel': u'self' }, { u'href': - (u'http://openstack.example.com/openstack/servers/' - '858f295a-8543-45fa-804a-08f8356d616d'), + (u'http://openstack.example.com/%s/servers/' + '858f295a-8543-45fa-804a-08f8356d616d' % + api_samples_test_base.PROJECT_ID + ), u'rel': u'bookmark' } ] diff --git a/nova/tests/unit/conf_fixture.py b/nova/tests/unit/conf_fixture.py index c27aa54131..4305c559b1 100644 --- a/nova/tests/unit/conf_fixture.py +++ b/nova/tests/unit/conf_fixture.py @@ -62,11 +62,11 @@ class ConfFixture(config_fixture.Config): group='api_database') self.conf.set_default('fatal_exception_format_errors', True) self.conf.set_default('enabled', True, 'osapi_v21') - # TODO(sdague): this makes our project_id match 'fake' and - # 'openstack' as well. We should fix the tests to use real + # TODO(sdague): this makes our project_id match 'fake' as well. + # We should fix the tests to use real # UUIDs then drop this work around. self.conf.set_default('project_id_regex', - '[0-9a-fopnstk\-]+', 'osapi_v21') + '[0-9a-fk\-]+', 'osapi_v21') self.conf.set_default('force_dhcp_release', False) self.conf.set_default('periodic_enable', False) policy_opts.set_defaults(self.conf)