From e31f9a9811478ab864adfff53d9e0266e35cab3d Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Thu, 10 Dec 2015 07:40:13 -0500 Subject: [PATCH] update API samples to use endpoints The use of %(host) and an hardcoded project_id makes the templates less semantically meaningful or flexible than they should be. It means all manner of hackery will need to be done to run a set of tests without project_id. This introduces two new semantic variables, ``compute_endpoint`` which is the unversioned compute endpoint (i.e. schema://host/project_id) and the ``versioned_compute_endpoint`` which includes the API version. Change-Id: Iead42f60c9e0cb703fc963e423e7bb99ca71094c --- .../all_extensions/flavor-get-resp.json.tpl | 4 +-- .../flavors-detail-resp.json.tpl | 20 ++++++------- .../all_extensions/flavors-list-resp.json.tpl | 20 ++++++------- .../server-action-rebuild-resp.json.tpl | 8 +++--- .../server-action-rebuild.json.tpl | 2 +- .../all_extensions/server-get-resp.json.tpl | 8 +++--- .../all_extensions/server-post-resp.json.tpl | 4 +-- .../servers-details-resp.json.tpl | 8 +++--- .../all_extensions/servers-list-resp.json.tpl | 4 +-- .../flavor-access-create-resp.json.tpl | 4 +-- .../flavor-access-detail-resp.json.tpl | 20 ++++++------- .../flavor-access-show-resp.json.tpl | 4 +-- .../flavor-create-post-resp.json.tpl | 4 +-- .../flavors/flavor-get-resp.json.tpl | 4 +-- .../flavors/flavors-detail-resp.json.tpl | 20 ++++++------- .../flavors/flavors-list-resp.json.tpl | 20 ++++++------- .../images/image-get-resp.json.tpl | 4 +-- .../images/images-details-get-resp.json.tpl | 28 +++++++++---------- .../images/images-list-get-resp.json.tpl | 28 +++++++++---------- .../server-action-rebuild-resp.json.tpl | 8 +++--- .../os-access-ips/server-get-resp.json.tpl | 8 +++--- .../os-access-ips/server-post-req.json.tpl | 4 +-- .../os-access-ips/server-post-resp.json.tpl | 4 +-- .../os-access-ips/server-put-resp.json.tpl | 8 +++--- .../servers-details-resp.json.tpl | 8 +++--- .../os-access-ips/servers-list-resp.json.tpl | 4 +-- .../availability-zone-post-req.json.tpl | 4 +-- .../availability-zone-post-resp.json.tpl | 4 +-- .../server-config-drive-get-resp.json.tpl | 8 +++--- .../os-config-drive/server-post-req.json.tpl | 2 +- .../os-config-drive/server-post-resp.json.tpl | 4 +-- ...servers-config-drive-details-resp.json.tpl | 8 +++--- .../list-servers-detail-get.json.tpl | 8 +++--- .../server-action-rebuild-req.json.tpl | 2 +- .../server-action-rebuild-resp.json.tpl | 8 +++--- .../os-disk-config/server-get-resp.json.tpl | 8 +++--- .../os-disk-config/server-post-req.json.tpl | 4 +-- .../os-disk-config/server-post-resp.json.tpl | 4 +-- .../server-update-put-resp.json.tpl | 8 +++--- .../server-get-resp.json.tpl | 8 +++--- .../servers-detail-resp.json.tpl | 8 +++--- .../server-get-resp.json.tpl | 8 +++--- .../servers-detail-resp.json.tpl | 8 +++--- .../server-get-resp.json.tpl | 8 +++--- .../servers-detail-resp.json.tpl | 8 +++--- .../server-get-resp.json.tpl | 8 +++--- .../servers-detail-resp.json.tpl | 8 +++--- .../flavor-rxtx-get-resp.json.tpl | 4 +-- .../flavor-rxtx-list-resp.json.tpl | 20 ++++++------- .../flavor-rxtx-post-resp.json.tpl | 4 +-- .../server-get-resp.json.tpl | 8 +++--- .../servers-details-resp.json.tpl | 8 +++--- .../servers-list-resp.json.tpl | 4 +-- .../multiple-create-no-resv-post-req.json.tpl | 4 +-- ...multiple-create-no-resv-post-resp.json.tpl | 4 +-- .../multiple-create-post-req.json.tpl | 4 +-- .../server-action-rebuild-resp.json.tpl | 8 +++--- .../os-personality/server-post-req.json.tpl | 4 +-- .../os-personality/server-post-resp.json.tpl | 4 +-- ...n-rebuild-preserve-ephemeral-resp.json.tpl | 8 +++--- .../os-rescue/server-get-resp-rescue.json.tpl | 8 +++--- .../server-get-resp-unrescue.json.tpl | 8 +++--- .../scheduler-hints-post-req.json.tpl | 2 +- .../scheduler-hints-post-resp.json.tpl | 4 +-- .../server-get-resp.json.tpl | 8 +++--- .../server-post-req.json.tpl | 2 +- .../server-post-resp.json.tpl | 4 +-- .../servers-detail-resp.json.tpl | 8 +++--- .../os-server-usage/server-get-resp.json.tpl | 8 +++--- .../servers-detail-resp.json.tpl | 8 +++--- .../os-user-data/userdata-post-req.json.tpl | 4 +-- .../os-user-data/userdata-post-resp.json.tpl | 4 +-- .../server-sort-keys-list-resp.json.tpl | 4 +-- .../server-action-rebuild-resp.json.tpl | 8 +++--- .../servers/server-get-resp.json.tpl | 8 +++--- .../servers/server-post-resp.json.tpl | 4 +-- .../servers/servers-details-resp.json.tpl | 8 +++--- .../servers/servers-list-resp.json.tpl | 4 +-- .../servers/v2.9/server-get-resp.json.tpl | 8 +++--- .../v2.9/servers-details-resp.json.tpl | 8 +++--- .../servers/v2.9/servers-list-resp.json.tpl | 4 +-- .../versions/v2-version-get-resp.json.tpl | 2 +- .../versions/v21-version-get-resp.json.tpl | 2 +- .../versions/versions-get-resp.json.tpl | 4 +-- .../api_sample_tests/test_access_ips.py | 10 +++---- .../api_sample_tests/test_disk_config.py | 2 +- .../api_sample_tests/test_multiple_create.py | 4 +-- .../api_sample_tests/test_servers.py | 22 +++++++++------ .../api_sample_tests/test_user_data.py | 2 +- .../tests/functional/api_samples_test_base.py | 13 +++++++++ 90 files changed, 341 insertions(+), 322 deletions(-) diff --git a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/flavor-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/flavor-get-resp.json.tpl index b68bc3c979e8..afb508556a6c 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/flavor-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/flavor-get-resp.json.tpl @@ -6,11 +6,11 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/1", + "href": "%(versioned_compute_endpoint)s/flavors/1", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/flavors-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/flavors-detail-resp.json.tpl index b2b92069459b..5dfd5e1c8c6b 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/flavors-detail-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/flavors-detail-resp.json.tpl @@ -7,11 +7,11 @@ "id": "1", "links": [ { - "href": "%(host)s/v2/openstack/flavors/1", + "href": "%(versioned_compute_endpoint)s/flavors/1", "rel": "self" }, { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ], @@ -29,11 +29,11 @@ "id": "2", "links": [ { - "href": "%(host)s/v2/openstack/flavors/2", + "href": "%(versioned_compute_endpoint)s/flavors/2", "rel": "self" }, { - "href": "%(host)s/openstack/flavors/2", + "href": "%(compute_endpoint)s/flavors/2", "rel": "bookmark" } ], @@ -51,11 +51,11 @@ "id": "3", "links": [ { - "href": "%(host)s/v2/openstack/flavors/3", + "href": "%(versioned_compute_endpoint)s/flavors/3", "rel": "self" }, { - "href": "%(host)s/openstack/flavors/3", + "href": "%(compute_endpoint)s/flavors/3", "rel": "bookmark" } ], @@ -73,11 +73,11 @@ "id": "4", "links": [ { - "href": "%(host)s/v2/openstack/flavors/4", + "href": "%(versioned_compute_endpoint)s/flavors/4", "rel": "self" }, { - "href": "%(host)s/openstack/flavors/4", + "href": "%(compute_endpoint)s/flavors/4", "rel": "bookmark" } ], @@ -95,11 +95,11 @@ "id": "5", "links": [ { - "href": "%(host)s/v2/openstack/flavors/5", + "href": "%(versioned_compute_endpoint)s/flavors/5", "rel": "self" }, { - "href": "%(host)s/openstack/flavors/5", + "href": "%(compute_endpoint)s/flavors/5", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/flavors-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/flavors-list-resp.json.tpl index ab86d2a52ac1..346a89f8bee9 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/flavors-list-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/flavors-list-resp.json.tpl @@ -4,11 +4,11 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/1", + "href": "%(versioned_compute_endpoint)s/flavors/1", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ], @@ -18,11 +18,11 @@ "id": "2", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/2", + "href": "%(versioned_compute_endpoint)s/flavors/2", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/2", + "href": "%(compute_endpoint)s/flavors/2", "rel": "bookmark" } ], @@ -32,11 +32,11 @@ "id": "3", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/3", + "href": "%(versioned_compute_endpoint)s/flavors/3", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/3", + "href": "%(compute_endpoint)s/flavors/3", "rel": "bookmark" } ], @@ -46,11 +46,11 @@ "id": "4", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/4", + "href": "%(versioned_compute_endpoint)s/flavors/4", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/4", + "href": "%(compute_endpoint)s/flavors/4", "rel": "bookmark" } ], @@ -60,11 +60,11 @@ "id": "5", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/5", + "href": "%(versioned_compute_endpoint)s/flavors/5", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/5", + "href": "%(compute_endpoint)s/flavors/5", "rel": "bookmark" } ], 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 2d3c19bd8634..b1e61d2bcc77 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 @@ -17,7 +17,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -28,18 +28,18 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] }, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-rebuild.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-rebuild.json.tpl index 72006bf18c4c..34d494a7fc38 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-rebuild.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-rebuild.json.tpl @@ -1,6 +1,6 @@ { "rebuild" : { - "imageRef" : "%(host)s/v2/32278/images/%(uuid)s", + "imageRef" : "%(versioned_compute_endpoint)s/images/%(uuid)s", "name" : "%(name)s", "adminPass" : "%(pass)s", "accessIPv4" : "%(access_ip_v4)s", 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 e56e93cc10c0..25861299bbc4 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 @@ -17,7 +17,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -28,7 +28,7 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] @@ -36,11 +36,11 @@ "key_name": null, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-post-resp.json.tpl index c931eb3fdc50..4b30e0cfbdb8 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-post-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-post-resp.json.tpl @@ -5,11 +5,11 @@ "id": "%(id)s", "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ], 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 a4eb8f017670..c4fce6bbb055 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 @@ -18,7 +18,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -29,7 +29,7 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] @@ -37,11 +37,11 @@ "key_name": null, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/servers-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/servers-list-resp.json.tpl index 76f234a7e914..586668759f5f 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/servers-list-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/servers-list-resp.json.tpl @@ -4,11 +4,11 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-create-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-create-resp.json.tpl index 31bbc8545d47..5ca61bbe351c 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-create-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-create-resp.json.tpl @@ -4,11 +4,11 @@ "id": "%(flavor_id)s", "links": [ { - "href": "%(host)s/v2/openstack/flavors/%(flavor_id)s", + "href": "%(versioned_compute_endpoint)s/flavors/%(flavor_id)s", "rel": "self" }, { - "href": "%(host)s/openstack/flavors/%(flavor_id)s", + "href": "%(compute_endpoint)s/flavors/%(flavor_id)s", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-detail-resp.json.tpl index ba1869bf4c47..a2d6ce7d2a2b 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-detail-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-detail-resp.json.tpl @@ -7,11 +7,11 @@ "id": "1", "links": [ { - "href": "%(host)s/v2/openstack/flavors/1", + "href": "%(versioned_compute_endpoint)s/flavors/1", "rel": "self" }, { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ], @@ -28,11 +28,11 @@ "id": "2", "links": [ { - "href": "%(host)s/v2/openstack/flavors/2", + "href": "%(versioned_compute_endpoint)s/flavors/2", "rel": "self" }, { - "href": "%(host)s/openstack/flavors/2", + "href": "%(compute_endpoint)s/flavors/2", "rel": "bookmark" } ], @@ -49,11 +49,11 @@ "id": "3", "links": [ { - "href": "%(host)s/v2/openstack/flavors/3", + "href": "%(versioned_compute_endpoint)s/flavors/3", "rel": "self" }, { - "href": "%(host)s/openstack/flavors/3", + "href": "%(compute_endpoint)s/flavors/3", "rel": "bookmark" } ], @@ -70,11 +70,11 @@ "id": "4", "links": [ { - "href": "%(host)s/v2/openstack/flavors/4", + "href": "%(versioned_compute_endpoint)s/flavors/4", "rel": "self" }, { - "href": "%(host)s/openstack/flavors/4", + "href": "%(compute_endpoint)s/flavors/4", "rel": "bookmark" } ], @@ -91,11 +91,11 @@ "id": "5", "links": [ { - "href": "%(host)s/v2/openstack/flavors/5", + "href": "%(versioned_compute_endpoint)s/flavors/5", "rel": "self" }, { - "href": "%(host)s/openstack/flavors/5", + "href": "%(compute_endpoint)s/flavors/5", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-show-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-show-resp.json.tpl index bd2b74b6189f..664db5c1fcfd 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-show-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-show-resp.json.tpl @@ -4,11 +4,11 @@ "id": "%(flavor_id)s", "links": [ { - "href": "%(host)s/v2/openstack/flavors/%(flavor_id)s", + "href": "%(versioned_compute_endpoint)s/flavors/%(flavor_id)s", "rel": "self" }, { - "href": "%(host)s/openstack/flavors/%(flavor_id)s", + "href": "%(compute_endpoint)s/flavors/%(flavor_id)s", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/flavor-manage/flavor-create-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavor-manage/flavor-create-post-resp.json.tpl index f63928b89260..180b78702939 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/flavor-manage/flavor-create-post-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/flavor-manage/flavor-create-post-resp.json.tpl @@ -4,11 +4,11 @@ "id": "%(flavor_id)s", "links": [ { - "href": "%(host)s/v2/openstack/flavors/%(flavor_id)s", + "href": "%(versioned_compute_endpoint)s/flavors/%(flavor_id)s", "rel": "self" }, { - "href": "%(host)s/openstack/flavors/%(flavor_id)s", + "href": "%(compute_endpoint)s/flavors/%(flavor_id)s", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/flavors/flavor-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavors/flavor-get-resp.json.tpl index 758aab143568..f3bd9fbcfc32 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/flavors/flavor-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/flavors/flavor-get-resp.json.tpl @@ -4,11 +4,11 @@ "id": "1", "links": [ { - "href": "%(host)s/v2/openstack/flavors/1", + "href": "%(versioned_compute_endpoint)s/flavors/1", "rel": "self" }, { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/flavors/flavors-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavors/flavors-detail-resp.json.tpl index ba1869bf4c47..a2d6ce7d2a2b 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/flavors/flavors-detail-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/flavors/flavors-detail-resp.json.tpl @@ -7,11 +7,11 @@ "id": "1", "links": [ { - "href": "%(host)s/v2/openstack/flavors/1", + "href": "%(versioned_compute_endpoint)s/flavors/1", "rel": "self" }, { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ], @@ -28,11 +28,11 @@ "id": "2", "links": [ { - "href": "%(host)s/v2/openstack/flavors/2", + "href": "%(versioned_compute_endpoint)s/flavors/2", "rel": "self" }, { - "href": "%(host)s/openstack/flavors/2", + "href": "%(compute_endpoint)s/flavors/2", "rel": "bookmark" } ], @@ -49,11 +49,11 @@ "id": "3", "links": [ { - "href": "%(host)s/v2/openstack/flavors/3", + "href": "%(versioned_compute_endpoint)s/flavors/3", "rel": "self" }, { - "href": "%(host)s/openstack/flavors/3", + "href": "%(compute_endpoint)s/flavors/3", "rel": "bookmark" } ], @@ -70,11 +70,11 @@ "id": "4", "links": [ { - "href": "%(host)s/v2/openstack/flavors/4", + "href": "%(versioned_compute_endpoint)s/flavors/4", "rel": "self" }, { - "href": "%(host)s/openstack/flavors/4", + "href": "%(compute_endpoint)s/flavors/4", "rel": "bookmark" } ], @@ -91,11 +91,11 @@ "id": "5", "links": [ { - "href": "%(host)s/v2/openstack/flavors/5", + "href": "%(versioned_compute_endpoint)s/flavors/5", "rel": "self" }, { - "href": "%(host)s/openstack/flavors/5", + "href": "%(compute_endpoint)s/flavors/5", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/flavors/flavors-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavors/flavors-list-resp.json.tpl index b767b312982e..a78ccd901365 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/flavors/flavors-list-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/flavors/flavors-list-resp.json.tpl @@ -4,11 +4,11 @@ "id": "1", "links": [ { - "href": "%(host)s/v2/openstack/flavors/1", + "href": "%(versioned_compute_endpoint)s/flavors/1", "rel": "self" }, { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ], @@ -18,11 +18,11 @@ "id": "2", "links": [ { - "href": "%(host)s/v2/openstack/flavors/2", + "href": "%(versioned_compute_endpoint)s/flavors/2", "rel": "self" }, { - "href": "%(host)s/openstack/flavors/2", + "href": "%(compute_endpoint)s/flavors/2", "rel": "bookmark" } ], @@ -32,11 +32,11 @@ "id": "3", "links": [ { - "href": "%(host)s/v2/openstack/flavors/3", + "href": "%(versioned_compute_endpoint)s/flavors/3", "rel": "self" }, { - "href": "%(host)s/openstack/flavors/3", + "href": "%(compute_endpoint)s/flavors/3", "rel": "bookmark" } ], @@ -46,11 +46,11 @@ "id": "4", "links": [ { - "href": "%(host)s/v2/openstack/flavors/4", + "href": "%(versioned_compute_endpoint)s/flavors/4", "rel": "self" }, { - "href": "%(host)s/openstack/flavors/4", + "href": "%(compute_endpoint)s/flavors/4", "rel": "bookmark" } ], @@ -60,11 +60,11 @@ "id": "5", "links": [ { - "href": "%(host)s/v2/openstack/flavors/5", + "href": "%(versioned_compute_endpoint)s/flavors/5", "rel": "self" }, { - "href": "%(host)s/openstack/flavors/5", + "href": "%(compute_endpoint)s/flavors/5", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/images/image-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/images/image-get-resp.json.tpl index 4f7e0d9cfb82..ae328159f230 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/images/image-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/images/image-get-resp.json.tpl @@ -5,11 +5,11 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "%(versioned_compute_endpoint)s/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "%(compute_endpoint)s/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" }, { diff --git a/nova/tests/functional/api_sample_tests/api_samples/images/images-details-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/images/images-details-get-resp.json.tpl index 5ae2bf87ec66..6f311fd744bf 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/images/images-details-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/images/images-details-get-resp.json.tpl @@ -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": "%(versioned_compute_endpoint)s/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "%(compute_endpoint)s/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" }, { @@ -38,11 +38,11 @@ "id": "155d900f-4e14-4e4c-a73d-069cbf4541e6", "links": [ { - "href": "http://openstack.example.com/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "href": "%(versioned_compute_endpoint)s/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "href": "%(compute_endpoint)s/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", "rel": "bookmark" }, { @@ -69,11 +69,11 @@ "id": "a2459075-d96c-40d5-893e-577ff92e721c", "links": [ { - "href": "http://openstack.example.com/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "href": "%(versioned_compute_endpoint)s/images/a2459075-d96c-40d5-893e-577ff92e721c", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "href": "%(compute_endpoint)s/images/a2459075-d96c-40d5-893e-577ff92e721c", "rel": "bookmark" }, { @@ -100,11 +100,11 @@ "id": "a440c04b-79fa-479c-bed1-0b816eaec379", "links": [ { - "href": "http://openstack.example.com/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "href": "%(versioned_compute_endpoint)s/images/a440c04b-79fa-479c-bed1-0b816eaec379", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "href": "%(compute_endpoint)s/images/a440c04b-79fa-479c-bed1-0b816eaec379", "rel": "bookmark" }, { @@ -132,11 +132,11 @@ "id": "c905cedb-7281-47e4-8a62-f26bc5fc4c77", "links": [ { - "href": "http://openstack.example.com/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "href": "%(versioned_compute_endpoint)s/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "href": "%(compute_endpoint)s/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", "rel": "bookmark" }, { @@ -162,11 +162,11 @@ "id": "cedef40a-ed67-4d10-800e-17455edce175", "links": [ { - "href": "http://openstack.example.com/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "href": "%(versioned_compute_endpoint)s/images/cedef40a-ed67-4d10-800e-17455edce175", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "href": "%(compute_endpoint)s/images/cedef40a-ed67-4d10-800e-17455edce175", "rel": "bookmark" }, { @@ -192,11 +192,11 @@ "id": "76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", "links": [ { - "href": "http://openstack.example.com/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "href": "%(versioned_compute_endpoint)s/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "href": "%(compute_endpoint)s/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", "rel": "bookmark" }, { diff --git a/nova/tests/functional/api_sample_tests/api_samples/images/images-list-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/images/images-list-get-resp.json.tpl index 451ce12688f6..035cc83695dd 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/images/images-list-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/images/images-list-get-resp.json.tpl @@ -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": "%(versioned_compute_endpoint)s/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "%(compute_endpoint)s/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": "%(versioned_compute_endpoint)s/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "href": "%(compute_endpoint)s/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": "%(versioned_compute_endpoint)s/images/a2459075-d96c-40d5-893e-577ff92e721c", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "href": "%(compute_endpoint)s/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": "%(versioned_compute_endpoint)s/images/a440c04b-79fa-479c-bed1-0b816eaec379", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "href": "%(compute_endpoint)s/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": "%(versioned_compute_endpoint)s/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "href": "%(compute_endpoint)s/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": "%(versioned_compute_endpoint)s/images/cedef40a-ed67-4d10-800e-17455edce175", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "href": "%(compute_endpoint)s/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": "%(versioned_compute_endpoint)s/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "href": "%(compute_endpoint)s/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", "rel": "bookmark" }, { 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 fd7f63b3ee90..1c416d28eb4c 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 @@ -14,7 +14,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -25,18 +25,18 @@ "id": "%(image_id)s", "links": [ { - "href": "%(host)s/openstack/images/%(image_id)s", + "href": "%(compute_endpoint)s/images/%(image_id)s", "rel": "bookmark" } ] }, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ], 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 442b0b16c8ce..6344fcb394bc 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 @@ -17,7 +17,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -28,18 +28,18 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] }, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-post-req.json.tpl index ccb1db98bb0c..37b06cd0fbb1 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-post-req.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-post-req.json.tpl @@ -3,8 +3,8 @@ "accessIPv4": "%(access_ip_v4)s", "accessIPv6": "%(access_ip_v6)s", "name" : "new-server-test", - "imageRef" : "%(host)s/openstack/images/%(image_id)s", - "flavorRef" : "%(host)s/openstack/flavors/1", + "imageRef" : "%(compute_endpoint)s/images/%(image_id)s", + "flavorRef" : "%(compute_endpoint)s/flavors/1", "metadata" : { "My Server Name" : "Apache1" } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-post-resp.json.tpl index abbc7cf6b2c6..5358868400cd 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-post-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-post-resp.json.tpl @@ -4,11 +4,11 @@ "id": "%(id)s", "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ] diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-put-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-put-resp.json.tpl index fb78ccdaa503..6df0507c34fc 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-put-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-put-resp.json.tpl @@ -15,7 +15,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -26,18 +26,18 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] }, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ], 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 2dac9724deae..ffa7c13a3fb6 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 @@ -18,7 +18,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -29,18 +29,18 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] }, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(id)s", + "href": "%(compute_endpoint)s/servers/%(id)s", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/servers-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/servers-list-resp.json.tpl index 8b97dc28d7df..f78d963d5d02 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/servers-list-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/servers-list-resp.json.tpl @@ -4,11 +4,11 @@ "id": "%(id)s", "links": [ { - "href": "%(host)s/v2/openstack/servers/%(id)s", + "href": "%(versioned_compute_endpoint)s/servers/%(id)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(id)s", + "href": "%(compute_endpoint)s/servers/%(id)s", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-post-req.json.tpl index f013ba079608..68c08e2ad46d 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-post-req.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-post-req.json.tpl @@ -1,8 +1,8 @@ { "server" : { "name" : "new-server-test", - "imageRef" : "%(host)s/openstack/images/%(image_id)s", - "flavorRef" : "%(host)s/openstack/flavors/1", + "imageRef" : "%(compute_endpoint)s/images/%(image_id)s", + "flavorRef" : "%(compute_endpoint)s/flavors/1", "metadata" : { "My Server Name" : "Apache1" }, diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-post-resp.json.tpl index d5f030c8730b..5358868400cd 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-post-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-post-resp.json.tpl @@ -4,11 +4,11 @@ "id": "%(id)s", "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ] 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 65b858c0be84..0253317ec998 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 @@ -18,7 +18,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -29,18 +29,18 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] }, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/server-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/server-post-req.json.tpl index 99adbe8290da..a59726dd3415 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/server-post-req.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/server-post-req.json.tpl @@ -4,7 +4,7 @@ "accessIPv6": "%(access_ip_v6)s", "name" : "new-server-test", "imageRef" : "%(glance_host)s/openstack/images/%(image_id)s", - "flavorRef" : "%(host)s/openstack/flavors/1", + "flavorRef" : "%(compute_endpoint)s/flavors/1", "metadata" : { "My Server Name" : "Apache1" } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/server-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/server-post-resp.json.tpl index abbc7cf6b2c6..5358868400cd 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/server-post-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/server-post-resp.json.tpl @@ -4,11 +4,11 @@ "id": "%(id)s", "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ] 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 12ef2545d47b..b5daa3e57f08 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 @@ -19,7 +19,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -30,18 +30,18 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] }, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(id)s", + "href": "%(compute_endpoint)s/servers/%(id)s", "rel": "bookmark" } ], 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 3ee1b79cbeba..3b447dee721b 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 @@ -19,7 +19,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -30,18 +30,18 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] }, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(id)s", + "href": "%(versioned_compute_endpoint)s/servers/%(id)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(id)s", + "href": "%(compute_endpoint)s/servers/%(id)s", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-action-rebuild-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-action-rebuild-req.json.tpl index b239818a8a5f..7ca3f724d563 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-action-rebuild-req.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-action-rebuild-req.json.tpl @@ -1,6 +1,6 @@ { "rebuild": { - "imageRef" : "%(host)s/openstack/images/%(image_id)s", + "imageRef" : "%(compute_endpoint)s/images/%(image_id)s", "OS-DCF:diskConfig": "AUTO" } } 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 f3f6618ea8b2..dcd1aeccedee 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 @@ -17,7 +17,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -28,18 +28,18 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] }, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(id)s", + "href": "%(versioned_compute_endpoint)s/servers/%(id)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(id)s", + "href": "%(compute_endpoint)s/servers/%(id)s", "rel": "bookmark" } ], 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 290c29c9353f..0eb9126e00c3 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 @@ -18,7 +18,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -29,18 +29,18 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] }, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(id)s", + "href": "%(versioned_compute_endpoint)s/servers/%(id)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(id)s", + "href": "%(compute_endpoint)s/servers/%(id)s", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-post-req.json.tpl index 8ba378730e50..e078e4370c65 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-post-req.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-post-req.json.tpl @@ -2,8 +2,8 @@ "server" : { "OS-DCF:diskConfig": "AUTO", "name" : "new-server-test", - "imageRef" : "%(host)s/openstack/images/%(image_id)s", - "flavorRef" : "%(host)s/openstack/flavors/1", + "imageRef" : "%(compute_endpoint)s/images/%(image_id)s", + "flavorRef" : "%(compute_endpoint)s/flavors/1", "metadata" : { "My Server Name" : "Apache1" } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-post-resp.json.tpl index 7c8371f16104..4b8a4b64bab9 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-post-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-post-resp.json.tpl @@ -5,11 +5,11 @@ "id": "%(id)s", "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ] diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-update-put-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-update-put-resp.json.tpl index 96eead83d270..047d9be04988 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-update-put-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-update-put-resp.json.tpl @@ -16,7 +16,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -27,18 +27,18 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] }, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(id)s", + "href": "%(versioned_compute_endpoint)s/servers/%(id)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(id)s", + "href": "%(compute_endpoint)s/servers/%(id)s", "rel": "bookmark" } ], 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 9195edad6c5f..5bb615d6390b 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 @@ -19,7 +19,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -30,18 +30,18 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] }, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ], 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 2671d014bada..a8923ae4b383 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 @@ -20,7 +20,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -31,18 +31,18 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] }, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(id)s", + "href": "%(versioned_compute_endpoint)s/servers/%(id)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(id)s", + "href": "%(compute_endpoint)s/servers/%(id)s", "rel": "bookmark" } ], 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 fa941155874d..cb64f7e164bc 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 @@ -21,7 +21,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -32,18 +32,18 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] }, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ], 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 4aeb6aeeb36e..9d607e20a33a 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 @@ -22,7 +22,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -33,18 +33,18 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] }, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(id)s", + "href": "%(versioned_compute_endpoint)s/servers/%(id)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(id)s", + "href": "%(compute_endpoint)s/servers/%(id)s", "rel": "bookmark" } ], 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 972a51f43ad3..337fb962e949 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 @@ -21,7 +21,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -32,18 +32,18 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] }, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ], 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 5ecd731f02fe..f83220df2fec 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 @@ -22,7 +22,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -33,18 +33,18 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] }, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(id)s", + "href": "%(versioned_compute_endpoint)s/servers/%(id)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(id)s", + "href": "%(compute_endpoint)s/servers/%(id)s", "rel": "bookmark" } ], 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 a72285b940f8..343bc1a2b12d 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 @@ -17,7 +17,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -28,18 +28,18 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] }, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ], 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 4a756af99ce7..41e2c5eb9fdd 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 @@ -19,7 +19,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -30,18 +30,18 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] }, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(id)s", + "href": "%(versioned_compute_endpoint)s/servers/%(id)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(id)s", + "href": "%(compute_endpoint)s/servers/%(id)s", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl index 343e42779273..6defdca90c26 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl @@ -6,11 +6,11 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/1", + "href": "%(versioned_compute_endpoint)s/flavors/1", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl index 33175e11d7eb..5dfd5e1c8c6b 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl @@ -7,11 +7,11 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/1", + "href": "%(versioned_compute_endpoint)s/flavors/1", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ], @@ -29,11 +29,11 @@ "id": "2", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/2", + "href": "%(versioned_compute_endpoint)s/flavors/2", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/2", + "href": "%(compute_endpoint)s/flavors/2", "rel": "bookmark" } ], @@ -51,11 +51,11 @@ "id": "3", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/3", + "href": "%(versioned_compute_endpoint)s/flavors/3", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/3", + "href": "%(compute_endpoint)s/flavors/3", "rel": "bookmark" } ], @@ -73,11 +73,11 @@ "id": "4", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/4", + "href": "%(versioned_compute_endpoint)s/flavors/4", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/4", + "href": "%(compute_endpoint)s/flavors/4", "rel": "bookmark" } ], @@ -95,11 +95,11 @@ "id": "5", "links": [ { - "href": "http://openstack.example.com/v2/openstack/flavors/5", + "href": "%(versioned_compute_endpoint)s/flavors/5", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/5", + "href": "%(compute_endpoint)s/flavors/5", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl index bb3180ba2daf..705d25b73684 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl @@ -4,11 +4,11 @@ "id": "%(flavor_id)s", "links": [ { - "href": "%(host)s/v2/openstack/flavors/%(flavor_id)s", + "href": "%(versioned_compute_endpoint)s/flavors/%(flavor_id)s", "rel": "self" }, { - "href": "%(host)s/openstack/flavors/%(flavor_id)s", + "href": "%(compute_endpoint)s/flavors/%(flavor_id)s", "rel": "bookmark" } ], 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 6d830268f979..7770af5c2cec 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 @@ -9,7 +9,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -20,7 +20,7 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] @@ -28,11 +28,11 @@ "key_name": null, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ], 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 2b3cccd75e5c..53e0c63bf44c 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 @@ -9,7 +9,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -20,7 +20,7 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] @@ -28,11 +28,11 @@ "key_name": null, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(id)s", + "href": "%(compute_endpoint)s/servers/%(id)s", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/servers-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/servers-list-resp.json.tpl index 8b97dc28d7df..f78d963d5d02 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/servers-list-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/servers-list-resp.json.tpl @@ -4,11 +4,11 @@ "id": "%(id)s", "links": [ { - "href": "%(host)s/v2/openstack/servers/%(id)s", + "href": "%(versioned_compute_endpoint)s/servers/%(id)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(id)s", + "href": "%(compute_endpoint)s/servers/%(id)s", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json.tpl index 9d66a40abfb6..4bda8eca1c7e 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json.tpl @@ -1,8 +1,8 @@ { "server": { "name": "new-server-test", - "imageRef": "%(host)s/openstack/images/%(image_id)s", - "flavorRef": "%(host)s/openstack/flavors/1", + "imageRef": "%(compute_endpoint)s/images/%(image_id)s", + "flavorRef": "%(compute_endpoint)s/flavors/1", "metadata": { "My Server Name": "Apache1" }, diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json.tpl index d5f030c8730b..5358868400cd 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json.tpl @@ -4,11 +4,11 @@ "id": "%(id)s", "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ] diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-multiple-create/multiple-create-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-multiple-create/multiple-create-post-req.json.tpl index b4b836acbbcc..0901e3afa026 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-multiple-create/multiple-create-post-req.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-multiple-create/multiple-create-post-req.json.tpl @@ -1,8 +1,8 @@ { "server": { "name": "new-server-test", - "imageRef": "%(host)s/openstack/images/%(image_id)s", - "flavorRef": "%(host)s/openstack/flavors/1", + "imageRef": "%(compute_endpoint)s/images/%(image_id)s", + "flavorRef": "%(compute_endpoint)s/flavors/1", "metadata": { "My Server Name": "Apache1" }, 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 06357e0400bb..03e2dca7e8bb 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 @@ -16,7 +16,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -27,18 +27,18 @@ "id": "%(image_id)s", "links": [ { - "href": "%(host)s/openstack/images/%(image_id)s", + "href": "%(compute_endpoint)s/images/%(image_id)s", "rel": "bookmark" } ] }, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-post-req.json.tpl index 3271a58a7d42..cbb99a73f298 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-post-req.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-post-req.json.tpl @@ -1,8 +1,8 @@ { "server": { "name": "new-server-test", - "imageRef": "%(host)s/openstack/images/%(image_id)s", - "flavorRef": "%(host)s/openstack/flavors/1", + "imageRef": "%(compute_endpoint)s/images/%(image_id)s", + "flavorRef": "%(compute_endpoint)s/flavors/1", "metadata": { "My Server Name": "Apache1" }, diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-post-resp.json.tpl index abbc7cf6b2c6..5358868400cd 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-post-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-post-resp.json.tpl @@ -4,11 +4,11 @@ "id": "%(id)s", "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ] 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 ae6fdfc00c11..866e8c37f2fa 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 @@ -16,7 +16,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -27,18 +27,18 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] }, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ], 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 e07d213762cf..68102dcb7dee 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 @@ -17,7 +17,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -28,18 +28,18 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] }, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(id)s", + "href": "%(versioned_compute_endpoint)s/servers/%(id)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(id)s", + "href": "%(compute_endpoint)s/servers/%(id)s", "rel": "bookmark" } ], 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 5c9598bd6f56..0af870336afd 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 @@ -17,7 +17,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -28,18 +28,18 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] }, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(id)s", + "href": "%(versioned_compute_endpoint)s/servers/%(id)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(id)s", + "href": "%(compute_endpoint)s/servers/%(id)s", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-scheduler-hints/scheduler-hints-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-scheduler-hints/scheduler-hints-post-req.json.tpl index a381df7444b8..8fe835431559 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-scheduler-hints/scheduler-hints-post-req.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-scheduler-hints/scheduler-hints-post-req.json.tpl @@ -2,7 +2,7 @@ "server" : { "name" : "new-server-test", "imageRef" : "%(glance_host)s/openstack/images/%(image_id)s", - "flavorRef" : "%(host)s/openstack/flavors/1" + "flavorRef" : "%(compute_endpoint)s/flavors/1" }, "OS-SCH-HNT:scheduler_hints": { "same_host": "%(uuid)s" diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json.tpl index abbc7cf6b2c6..5358868400cd 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json.tpl @@ -4,11 +4,11 @@ "id": "%(id)s", "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ] 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 dcb0442464a5..9e3c2bac864f 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 @@ -17,7 +17,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -28,18 +28,18 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] }, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-post-req.json.tpl index 151b2faa883b..b4f461ad2645 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-post-req.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-post-req.json.tpl @@ -4,7 +4,7 @@ "accessIPv6": "%(access_ip_v6)s", "name" : "new-server-test", "imageRef" : "%(glance_host)s/openstack/images/%(image_id)s", - "flavorRef" : "%(host)s/openstack/flavors/1", + "flavorRef" : "%(compute_endpoint)s/flavors/1", "metadata" : { "My Server Name" : "Apache1" }, diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-post-resp.json.tpl index e0a2ff805da8..111738534162 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-post-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-post-resp.json.tpl @@ -4,11 +4,11 @@ "id": "%(id)s", "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ], 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 bda75ee5aaca..f5f655a40358 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 @@ -19,7 +19,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -30,18 +30,18 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] }, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(id)s", + "href": "%(versioned_compute_endpoint)s/servers/%(id)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(id)s", + "href": "%(compute_endpoint)s/servers/%(id)s", "rel": "bookmark" } ], 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 3d3c43f4065a..e189c90058b7 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 @@ -19,7 +19,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -30,7 +30,7 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] @@ -38,11 +38,11 @@ "key_name": null, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ], 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 e1d8fada9589..2dad91193a80 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 @@ -20,11 +20,11 @@ "key_name": null, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(id)s", + "href": "%(compute_endpoint)s/servers/%(id)s", "rel": "bookmark" } ], @@ -34,7 +34,7 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] @@ -47,7 +47,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-user-data/userdata-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-user-data/userdata-post-req.json.tpl index 37f0a75d0a98..6370df85674e 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-user-data/userdata-post-req.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-user-data/userdata-post-req.json.tpl @@ -1,8 +1,8 @@ { "server" : { "name" : "new-server-test", - "imageRef" : "%(host)s/openstack/images/%(image_id)s", - "flavorRef" : "%(host)s/openstack/flavors/1", + "imageRef" : "%(compute_endpoint)s/images/%(image_id)s", + "flavorRef" : "%(compute_endpoint)s/flavors/1", "metadata" : { "My Server Name" : "Apache1" }, diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-user-data/userdata-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-user-data/userdata-post-resp.json.tpl index d5f030c8730b..5358868400cd 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-user-data/userdata-post-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-user-data/userdata-post-resp.json.tpl @@ -4,11 +4,11 @@ "id": "%(id)s", "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ] diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers-sort/server-sort-keys-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers-sort/server-sort-keys-list-resp.json.tpl index 8b97dc28d7df..f78d963d5d02 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers-sort/server-sort-keys-list-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers-sort/server-sort-keys-list-resp.json.tpl @@ -4,11 +4,11 @@ "id": "%(id)s", "links": [ { - "href": "%(host)s/v2/openstack/servers/%(id)s", + "href": "%(versioned_compute_endpoint)s/servers/%(id)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(id)s", + "href": "%(compute_endpoint)s/servers/%(id)s", "rel": "bookmark" } ], 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 ae6fdfc00c11..866e8c37f2fa 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 @@ -16,7 +16,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -27,18 +27,18 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] }, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ], 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 18da5adad7ef..6079555d0132 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 @@ -17,7 +17,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -28,7 +28,7 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] @@ -36,11 +36,11 @@ "key_name": null, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/server-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/server-post-resp.json.tpl index abbc7cf6b2c6..5358868400cd 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/server-post-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/server-post-resp.json.tpl @@ -4,11 +4,11 @@ "id": "%(id)s", "links": [ { - "href": "http://openstack.example.com/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ] 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 fa0cda5f3f2f..1093ff1248e0 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 @@ -18,7 +18,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -29,7 +29,7 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] @@ -37,11 +37,11 @@ "key_name": null, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(id)s", + "href": "%(compute_endpoint)s/servers/%(id)s", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/servers-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/servers-list-resp.json.tpl index 8b97dc28d7df..f78d963d5d02 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/servers-list-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/servers-list-resp.json.tpl @@ -4,11 +4,11 @@ "id": "%(id)s", "links": [ { - "href": "%(host)s/v2/openstack/servers/%(id)s", + "href": "%(versioned_compute_endpoint)s/servers/%(id)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(id)s", + "href": "%(compute_endpoint)s/servers/%(id)s", "rel": "bookmark" } ], 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 9897cd332cce..a99eb0c8bf7b 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 @@ -17,7 +17,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -28,7 +28,7 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] @@ -36,11 +36,11 @@ "key_name": null, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(uuid)s", + "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } ], 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 737314c3998e..19983856b7ff 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 @@ -18,7 +18,7 @@ "id": "1", "links": [ { - "href": "%(host)s/openstack/flavors/1", + "href": "%(compute_endpoint)s/flavors/1", "rel": "bookmark" } ] @@ -29,7 +29,7 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/openstack/images/%(uuid)s", + "href": "%(compute_endpoint)s/images/%(uuid)s", "rel": "bookmark" } ] @@ -37,11 +37,11 @@ "key_name": null, "links": [ { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(id)s", + "href": "%(compute_endpoint)s/servers/%(id)s", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-list-resp.json.tpl index 8b97dc28d7df..f78d963d5d02 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-list-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-list-resp.json.tpl @@ -4,11 +4,11 @@ "id": "%(id)s", "links": [ { - "href": "%(host)s/v2/openstack/servers/%(id)s", + "href": "%(versioned_compute_endpoint)s/servers/%(id)s", "rel": "self" }, { - "href": "%(host)s/openstack/servers/%(id)s", + "href": "%(compute_endpoint)s/servers/%(id)s", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_sample_tests/api_samples/versions/v2-version-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/versions/v2-version-get-resp.json.tpl index 097498e4dbe3..02d239f8a0b0 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/versions/v2-version-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/versions/v2-version-get-resp.json.tpl @@ -3,7 +3,7 @@ "id": "v2.0", "links": [ { - "href": "http://openstack.example.com/v2/", + "href": "%(host)s/v2/", "rel": "self" }, { diff --git a/nova/tests/functional/api_sample_tests/api_samples/versions/v21-version-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/versions/v21-version-get-resp.json.tpl index ad5183985065..a7edf3ce4cd9 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/versions/v21-version-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/versions/v21-version-get-resp.json.tpl @@ -3,7 +3,7 @@ "id": "v2.1", "links": [ { - "href": "http://openstack.example.com/v2.1/", + "href": "%(host)s/v2.1/", "rel": "self" }, { diff --git a/nova/tests/functional/api_sample_tests/api_samples/versions/versions-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/versions/versions-get-resp.json.tpl index 198ea986e6b9..c08326180380 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/versions/versions-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/versions/versions-get-resp.json.tpl @@ -4,7 +4,7 @@ "id": "v2.0", "links": [ { - "href": "http://openstack.example.com/v2/", + "href": "%(host)s/v2/", "rel": "self" } ], @@ -17,7 +17,7 @@ "id": "v2.1", "links": [ { - "href": "http://openstack.example.com/v2.1/", + "href": "%(host)s/v2.1/", "rel": "self" } ], diff --git a/nova/tests/functional/api_sample_tests/test_access_ips.py b/nova/tests/functional/api_sample_tests/test_access_ips.py index a6076364d391..a25f257f7af9 100644 --- a/nova/tests/functional/api_sample_tests/test_access_ips.py +++ b/nova/tests/functional/api_sample_tests/test_access_ips.py @@ -46,7 +46,7 @@ class AccessIPsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): def test_servers_post(self): subs = { 'image_id': fake.get_valid_image_id(), - 'host': self._get_host(), + 'compute_endpoint': self._get_compute_endpoint(), 'access_ip_v4': '1.2.3.4', 'access_ip_v6': 'fe80::' } @@ -55,7 +55,7 @@ class AccessIPsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): def test_servers_get(self): subs = { 'image_id': fake.get_valid_image_id(), - 'host': self._get_host(), + 'compute_endpoint': self._get_compute_endpoint(), 'access_ip_v4': '1.2.3.4', 'access_ip_v6': 'fe80::' } @@ -68,7 +68,7 @@ class AccessIPsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): def test_servers_details(self): subs = { 'image_id': fake.get_valid_image_id(), - 'host': self._get_host(), + 'compute_endpoint': self._get_compute_endpoint(), 'access_ip_v4': '1.2.3.4', 'access_ip_v6': 'fe80::' } @@ -81,7 +81,7 @@ class AccessIPsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): def test_servers_rebuild(self): subs = { 'image_id': fake.get_valid_image_id(), - 'host': self._get_host(), + 'compute_endpoint': self._get_compute_endpoint(), 'access_ip_v4': '1.2.3.4', 'access_ip_v6': 'fe80::' } @@ -98,7 +98,7 @@ class AccessIPsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): def test_servers_update(self): subs = { 'image_id': fake.get_valid_image_id(), - 'host': self._get_host(), + 'compute_endpoint': self._get_compute_endpoint(), 'access_ip_v4': '1.2.3.4', 'access_ip_v6': 'fe80::' } diff --git a/nova/tests/functional/api_sample_tests/test_disk_config.py b/nova/tests/functional/api_sample_tests/test_disk_config.py index 0c803d3acb00..71cdf0fb0571 100644 --- a/nova/tests/functional/api_sample_tests/test_disk_config.py +++ b/nova/tests/functional/api_sample_tests/test_disk_config.py @@ -85,7 +85,7 @@ class DiskConfigJsonTest(test_servers.ServersSampleBase): uuid = self._post_server(use_common_server_api_samples=False) subs = { 'image_id': fake.get_valid_image_id(), - 'host': self._get_host(), + 'compute_endpoint': self._get_compute_endpoint(), } response = self._do_post('servers/%s/action' % uuid, 'server-action-rebuild-req', subs) diff --git a/nova/tests/functional/api_sample_tests/test_multiple_create.py b/nova/tests/functional/api_sample_tests/test_multiple_create.py index 35449a44bae7..d33f3d2ad81a 100644 --- a/nova/tests/functional/api_sample_tests/test_multiple_create.py +++ b/nova/tests/functional/api_sample_tests/test_multiple_create.py @@ -37,7 +37,7 @@ class MultipleCreateJsonTest(test_servers.ServersSampleBase): def test_multiple_create(self): subs = { 'image_id': fake.get_valid_image_id(), - 'host': self._get_host(), + 'compute_endpoint': self._get_compute_endpoint(), 'min_count': "2", 'max_count': "3" } @@ -48,7 +48,7 @@ class MultipleCreateJsonTest(test_servers.ServersSampleBase): def test_multiple_create_without_reservation_id(self): subs = { 'image_id': fake.get_valid_image_id(), - 'host': self._get_host(), + 'compute_endpoint': self._get_compute_endpoint(), 'min_count': "2", 'max_count': "3" } diff --git a/nova/tests/functional/api_sample_tests/test_servers.py b/nova/tests/functional/api_sample_tests/test_servers.py index 8b0b167e8f8a..31269f1a49c8 100644 --- a/nova/tests/functional/api_sample_tests/test_servers.py +++ b/nova/tests/functional/api_sample_tests/test_servers.py @@ -36,6 +36,8 @@ class ServersSampleBase(api_sample_base.ApiSampleTestBaseV21): subs = { 'image_id': fake.get_valid_image_id(), 'host': self._get_host(), + 'compute_endpoint': self._get_compute_endpoint(), + 'versioned_compute_endpoint': self._get_vers_compute_endpoint(), 'glance_host': self._get_glance_host(), 'access_ip_v4': '1.2.3.4', 'access_ip_v6': '80fe::' @@ -174,14 +176,18 @@ class ServersActionsJsonTest(ServersSampleBase): def test_server_rebuild(self): uuid = self._post_server() image = fake.get_valid_image_id() - subs = {'host': self._get_host(), - 'uuid': image, - 'name': 'foobar', - 'pass': 'seekr3t', - 'hostid': '[a-f0-9]+', - 'access_ip_v4': '1.2.3.4', - 'access_ip_v6': '80fe::', - } + subs = { + 'host': self._get_host(), + 'compute_endpoint': self._get_compute_endpoint(), + 'versioned_compute_endpoint': self._get_vers_compute_endpoint(), + 'uuid': image, + 'name': 'foobar', + 'pass': 'seekr3t', + 'hostid': '[a-f0-9]+', + 'access_ip_v4': '1.2.3.4', + 'access_ip_v6': '80fe::', + } + self._test_server_action(uuid, 'rebuild', 'server-action-rebuild', subs, diff --git a/nova/tests/functional/api_sample_tests/test_user_data.py b/nova/tests/functional/api_sample_tests/test_user_data.py index 3f45f520e243..ff221b15540e 100644 --- a/nova/tests/functional/api_sample_tests/test_user_data.py +++ b/nova/tests/functional/api_sample_tests/test_user_data.py @@ -39,7 +39,7 @@ class UserDataJsonTest(api_sample_base.ApiSampleTestBaseV21): user_data = base64.b64encode(user_data_contents) subs = { 'image_id': fake.get_valid_image_id(), - 'host': self._get_host(), + 'compute_endpoint': self._get_compute_endpoint(), 'user_data': user_data } response = self._do_post('servers', 'userdata-post-req', subs) diff --git a/nova/tests/functional/api_samples_test_base.py b/nova/tests/functional/api_samples_test_base.py index 7ced021a0954..147006307781 100644 --- a/nova/tests/functional/api_samples_test_base.py +++ b/nova/tests/functional/api_samples_test_base.py @@ -335,8 +335,21 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase): 'text': text, 'int': '[0-9]+', 'user_id': text, + 'api_vers': self._api_version, + 'compute_endpoint': self._get_compute_endpoint(), + 'versioned_compute_endpoint': self._get_vers_compute_endpoint(), } + def _get_compute_endpoint(self): + # NOTE(sdague): "openstack" is stand in for project_id, it + # should be more generic in future. + return '%s/%s' % (self._get_host(), 'openstack') + + def _get_vers_compute_endpoint(self): + # NOTE(sdague): "openstack" is stand in for project_id, it + # should be more generic in future. + return '%s/%s/%s' % (self._get_host(), self._api_version, 'openstack') + def _get_response(self, url, method, body=None, strip_version=False, api_version=None, headers=None): headers = headers or {}