From f9f3946e0d0d34e5d431ccbff0507d6027cc6fd2 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Mon, 14 Dec 2015 10:04:46 -0500 Subject: [PATCH] Use just ids in all request templates for flavors/images While the API allows for strings which happen to end in an ID for flavorRef/imageRef, the common path is really just the ID itself, and we should have the samples do this. The use of full urls in our samples makes it seem like this is more meaningful than it really is, and that you could pass a url to a remote system, for instance, which won't work at all. Change-Id: I669619b627f954232712d54498b3744353d25451 --- doc/api_samples/all_extensions/server-action-rebuild.json | 4 ++-- doc/api_samples/all_extensions/server-post-req.json | 4 ++-- doc/api_samples/os-access-ips/server-action-rebuild.json | 2 +- doc/api_samples/os-access-ips/server-post-req.json | 6 +++--- .../os-availability-zone/availability-zone-post-req.json | 6 +++--- doc/api_samples/os-config-drive/server-post-req.json | 4 ++-- .../os-disk-config/server-action-rebuild-req.json | 4 ++-- doc/api_samples/os-disk-config/server-post-req.json | 6 +++--- .../multiple-create-no-resv-post-req.json | 4 ++-- .../os-multiple-create/multiple-create-post-req.json | 4 ++-- .../os-personality/server-action-rebuild-req.json | 2 +- doc/api_samples/os-personality/server-post-req.json | 6 +++--- .../server-action-rebuild-preserve-ephemeral.json | 2 +- .../os-scheduler-hints/scheduler-hints-post-req.json | 4 ++-- doc/api_samples/os-security-groups/server-post-req.json | 6 +++--- doc/api_samples/os-user-data/userdata-post-req.json | 4 ++-- .../servers/server-action-rebuild-preserve-ephemeral.json | 4 ++-- doc/api_samples/servers/server-action-rebuild.json | 4 ++-- doc/api_samples/servers/server-post-req.json | 4 ++-- .../all_extensions/server-action-rebuild.json.tpl | 2 +- .../api_samples/all_extensions/server-post-req.json.tpl | 4 ++-- .../os-access-ips/server-action-rebuild.json.tpl | 2 +- .../api_samples/os-access-ips/server-post-req.json.tpl | 4 ++-- .../availability-zone-post-req.json.tpl | 4 ++-- .../api_samples/os-config-drive/server-post-req.json.tpl | 4 ++-- .../os-disk-config/server-action-rebuild-req.json.tpl | 2 +- .../api_samples/os-disk-config/server-post-req.json.tpl | 4 ++-- .../multiple-create-no-resv-post-req.json.tpl | 4 ++-- .../os-multiple-create/multiple-create-post-req.json.tpl | 4 ++-- .../os-personality/server-action-rebuild-req.json.tpl | 2 +- .../api_samples/os-personality/server-post-req.json.tpl | 4 ++-- .../server-action-rebuild-preserve-ephemeral.json.tpl | 2 +- .../os-scheduler-hints/scheduler-hints-post-req.json.tpl | 4 ++-- .../api_samples/os-security-groups/server-post-req.json.tpl | 4 ++-- .../api_samples/os-user-data/userdata-post-req.json.tpl | 4 ++-- .../api_samples/servers/server-action-rebuild.json.tpl | 2 +- .../api_samples/servers/server-post-req.json.tpl | 4 ++-- 37 files changed, 70 insertions(+), 70 deletions(-) diff --git a/doc/api_samples/all_extensions/server-action-rebuild.json b/doc/api_samples/all_extensions/server-action-rebuild.json index 55f0f609f0b5..f79d3b7f24fa 100644 --- a/doc/api_samples/all_extensions/server-action-rebuild.json +++ b/doc/api_samples/all_extensions/server-action-rebuild.json @@ -1,6 +1,6 @@ { "rebuild" : { - "imageRef" : "http://openstack.example.com/v2/32278/images/70a599e0-31e7-49b7-b260-868f441e862b", + "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b", "name" : "foobar", "adminPass" : "seekr3t", "accessIPv4" : "1.2.3.4", @@ -15,4 +15,4 @@ } ] } -} \ No newline at end of file +} diff --git a/doc/api_samples/all_extensions/server-post-req.json b/doc/api_samples/all_extensions/server-post-req.json index d4c7973c108d..439f9b97acba 100644 --- a/doc/api_samples/all_extensions/server-post-req.json +++ b/doc/api_samples/all_extensions/server-post-req.json @@ -1,8 +1,8 @@ { "server" : { "name" : "new-server-test", - "imageRef" : "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", - "flavorRef" : "http://openstack.example.com/flavors/1", + "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b", + "flavorRef" : "1", "metadata" : { "My Server Name" : "Apache1" } diff --git a/doc/api_samples/os-access-ips/server-action-rebuild.json b/doc/api_samples/os-access-ips/server-action-rebuild.json index f6d3da3cddca..15550d0a6551 100644 --- a/doc/api_samples/os-access-ips/server-action-rebuild.json +++ b/doc/api_samples/os-access-ips/server-action-rebuild.json @@ -2,7 +2,7 @@ "rebuild" : { "accessIPv4": "4.3.2.1", "accessIPv6": "80fe::", - "imageRef" : "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", + "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b", "name" : "new-server-test", "metadata" : { "meta_var" : "meta_val" diff --git a/doc/api_samples/os-access-ips/server-post-req.json b/doc/api_samples/os-access-ips/server-post-req.json index 21b6b7211ce2..8d7489c10427 100644 --- a/doc/api_samples/os-access-ips/server-post-req.json +++ b/doc/api_samples/os-access-ips/server-post-req.json @@ -3,10 +3,10 @@ "accessIPv4": "1.2.3.4", "accessIPv6": "fe80::", "name" : "new-server-test", - "imageRef" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", - "flavorRef" : "http://openstack.example.com/openstack/flavors/1", + "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b", + "flavorRef" : "1", "metadata" : { "My Server Name" : "Apache1" } } -} \ No newline at end of file +} diff --git a/doc/api_samples/os-availability-zone/availability-zone-post-req.json b/doc/api_samples/os-availability-zone/availability-zone-post-req.json index 67d50e2f2442..e19960f6be39 100644 --- a/doc/api_samples/os-availability-zone/availability-zone-post-req.json +++ b/doc/api_samples/os-availability-zone/availability-zone-post-req.json @@ -1,8 +1,8 @@ { "server" : { "name" : "new-server-test", - "imageRef" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", - "flavorRef" : "http://openstack.example.com/openstack/flavors/1", + "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b", + "flavorRef" : "1", "metadata" : { "My Server Name" : "Apache1" }, @@ -14,4 +14,4 @@ } ] } -} \ No newline at end of file +} diff --git a/doc/api_samples/os-config-drive/server-post-req.json b/doc/api_samples/os-config-drive/server-post-req.json index 3c4d1055d5c1..ca53f3a7c26c 100644 --- a/doc/api_samples/os-config-drive/server-post-req.json +++ b/doc/api_samples/os-config-drive/server-post-req.json @@ -3,8 +3,8 @@ "accessIPv4": "1.2.3.4", "accessIPv6": "80fe::", "name" : "new-server-test", - "imageRef" : "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", - "flavorRef" : "http://openstack.example.com/openstack/flavors/1", + "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b", + "flavorRef" : "1", "metadata" : { "My Server Name" : "Apache1" } diff --git a/doc/api_samples/os-disk-config/server-action-rebuild-req.json b/doc/api_samples/os-disk-config/server-action-rebuild-req.json index 514607f6d244..670e11e79b4f 100644 --- a/doc/api_samples/os-disk-config/server-action-rebuild-req.json +++ b/doc/api_samples/os-disk-config/server-action-rebuild-req.json @@ -1,6 +1,6 @@ { "rebuild": { - "imageRef" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b", "OS-DCF:diskConfig": "AUTO" } -} \ No newline at end of file +} diff --git a/doc/api_samples/os-disk-config/server-post-req.json b/doc/api_samples/os-disk-config/server-post-req.json index b754fc0714cb..439f9b97acba 100644 --- a/doc/api_samples/os-disk-config/server-post-req.json +++ b/doc/api_samples/os-disk-config/server-post-req.json @@ -1,10 +1,10 @@ { "server" : { "name" : "new-server-test", - "imageRef" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", - "flavorRef" : "http://openstack.example.com/openstack/flavors/1", + "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b", + "flavorRef" : "1", "metadata" : { "My Server Name" : "Apache1" } } -} \ No newline at end of file +} diff --git a/doc/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json b/doc/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json index 74a69f6b6cb8..e0dfc07f02fb 100644 --- a/doc/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json +++ b/doc/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json @@ -1,8 +1,8 @@ { "server": { "name": "new-server-test", - "imageRef": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", - "flavorRef": "http://openstack.example.com/openstack/flavors/1", + "imageRef": "70a599e0-31e7-49b7-b260-868f441e862b", + "flavorRef": "1", "metadata": { "My Server Name": "Apache1" }, diff --git a/doc/api_samples/os-multiple-create/multiple-create-post-req.json b/doc/api_samples/os-multiple-create/multiple-create-post-req.json index 91367de93734..08386e8f1c2b 100644 --- a/doc/api_samples/os-multiple-create/multiple-create-post-req.json +++ b/doc/api_samples/os-multiple-create/multiple-create-post-req.json @@ -1,8 +1,8 @@ { "server": { "name": "new-server-test", - "imageRef": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", - "flavorRef": "http://openstack.example.com/openstack/flavors/1", + "imageRef": "70a599e0-31e7-49b7-b260-868f441e862b", + "flavorRef": "1", "metadata": { "My Server Name": "Apache1" }, diff --git a/doc/api_samples/os-personality/server-action-rebuild-req.json b/doc/api_samples/os-personality/server-action-rebuild-req.json index 4394a47c1668..0874437e0c07 100644 --- a/doc/api_samples/os-personality/server-action-rebuild-req.json +++ b/doc/api_samples/os-personality/server-action-rebuild-req.json @@ -2,7 +2,7 @@ "rebuild": { "accessIPv4" : "1.2.3.4", "accessIPv6" : "80fe::", - "imageRef": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", + "imageRef": "70a599e0-31e7-49b7-b260-868f441e862b", "name": "new-server-test", "metadata": { "meta_var": "meta_val" diff --git a/doc/api_samples/os-personality/server-post-req.json b/doc/api_samples/os-personality/server-post-req.json index b5718995eeae..5574b7305089 100644 --- a/doc/api_samples/os-personality/server-post-req.json +++ b/doc/api_samples/os-personality/server-post-req.json @@ -1,8 +1,8 @@ { "server": { "name": "new-server-test", - "imageRef": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", - "flavorRef": "http://openstack.example.com/openstack/flavors/1", + "imageRef": "70a599e0-31e7-49b7-b260-868f441e862b", + "flavorRef": "1", "metadata": { "My Server Name": "Apache1" }, @@ -13,4 +13,4 @@ } ] } -} \ No newline at end of file +} diff --git a/doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral.json b/doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral.json index 2e2ea76d1ca8..90f7a07d3c38 100644 --- a/doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral.json +++ b/doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral.json @@ -1,6 +1,6 @@ { "rebuild": { - "imageRef": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", + "imageRef": "70a599e0-31e7-49b7-b260-868f441e862b", "name": "foobar", "adminPass": "seekr3t", "metadata": { diff --git a/doc/api_samples/os-scheduler-hints/scheduler-hints-post-req.json b/doc/api_samples/os-scheduler-hints/scheduler-hints-post-req.json index 0466cecb1854..981b5b63b5ca 100644 --- a/doc/api_samples/os-scheduler-hints/scheduler-hints-post-req.json +++ b/doc/api_samples/os-scheduler-hints/scheduler-hints-post-req.json @@ -1,8 +1,8 @@ { "server" : { "name" : "new-server-test", - "imageRef" : "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", - "flavorRef" : "http://openstack.example.com/openstack/flavors/1" + "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b", + "flavorRef" : "1" }, "OS-SCH-HNT:scheduler_hints": { "same_host": "48e6a9f6-30af-47e0-bc04-acaed113bb4e" diff --git a/doc/api_samples/os-security-groups/server-post-req.json b/doc/api_samples/os-security-groups/server-post-req.json index df7f5a783dfa..cc589208cc19 100644 --- a/doc/api_samples/os-security-groups/server-post-req.json +++ b/doc/api_samples/os-security-groups/server-post-req.json @@ -3,11 +3,11 @@ "accessIPv4": "1.2.3.4", "accessIPv6": "80fe::", "name" : "new-server-test", - "imageRef" : "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", - "flavorRef" : "http://openstack.example.com/openstack/flavors/1", + "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b", + "flavorRef" : "1", "metadata" : { "My Server Name" : "Apache1" }, "security_groups": [{"name": "test"}] } -} \ No newline at end of file +} diff --git a/doc/api_samples/os-user-data/userdata-post-req.json b/doc/api_samples/os-user-data/userdata-post-req.json index e11c61096192..e8f78ff4b397 100644 --- a/doc/api_samples/os-user-data/userdata-post-req.json +++ b/doc/api_samples/os-user-data/userdata-post-req.json @@ -1,8 +1,8 @@ { "server" : { "name" : "new-server-test", - "imageRef" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", - "flavorRef" : "http://openstack.example.com/openstack/flavors/1", + "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b", + "flavorRef" : "1", "metadata" : { "My Server Name" : "Apache1" }, diff --git a/doc/api_samples/servers/server-action-rebuild-preserve-ephemeral.json b/doc/api_samples/servers/server-action-rebuild-preserve-ephemeral.json index e348f8af4f11..1df6ec77683f 100644 --- a/doc/api_samples/servers/server-action-rebuild-preserve-ephemeral.json +++ b/doc/api_samples/servers/server-action-rebuild-preserve-ephemeral.json @@ -1,6 +1,6 @@ { "rebuild" : { - "imageRef" : "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", + "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b", "name" : "foobar", "adminPass" : "seekr3t", "metadata" : { @@ -14,4 +14,4 @@ ], "preserve_ephemeral": true } -} \ No newline at end of file +} diff --git a/doc/api_samples/servers/server-action-rebuild.json b/doc/api_samples/servers/server-action-rebuild.json index b1b93ec89b65..ef089054ea6e 100644 --- a/doc/api_samples/servers/server-action-rebuild.json +++ b/doc/api_samples/servers/server-action-rebuild.json @@ -2,11 +2,11 @@ "rebuild" : { "accessIPv4" : "1.2.3.4", "accessIPv6" : "80fe::", - "imageRef" : "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", + "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b", "name" : "foobar", "adminPass" : "seekr3t", "metadata" : { "meta_var" : "meta_val" } } -} \ No newline at end of file +} diff --git a/doc/api_samples/servers/server-post-req.json b/doc/api_samples/servers/server-post-req.json index 42b0df979033..ca53f3a7c26c 100644 --- a/doc/api_samples/servers/server-post-req.json +++ b/doc/api_samples/servers/server-post-req.json @@ -3,8 +3,8 @@ "accessIPv4": "1.2.3.4", "accessIPv6": "80fe::", "name" : "new-server-test", - "imageRef" : "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", - "flavorRef" : "http://openstack.example.com/flavors/1", + "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b", + "flavorRef" : "1", "metadata" : { "My Server Name" : "Apache1" } 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 34d494a7fc38..ba750155a3ad 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" : "%(versioned_compute_endpoint)s/images/%(uuid)s", + "imageRef" : "%(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-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-post-req.json.tpl index ab0a3bb797eb..0562dcb136dc 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-post-req.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-post-req.json.tpl @@ -1,8 +1,8 @@ { "server" : { "name" : "new-server-test", - "imageRef" : "%(glance_host)s/images/%(image_id)s", - "flavorRef" : "%(host)s/flavors/1", + "imageRef" : "%(image_id)s", + "flavorRef" : "1", "metadata" : { "My Server Name" : "Apache1" } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-action-rebuild.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-action-rebuild.json.tpl index 095653e6ca02..556946485d9d 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-action-rebuild.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-action-rebuild.json.tpl @@ -2,7 +2,7 @@ "rebuild" : { "accessIPv4": "%(access_ip_v4)s", "accessIPv6": "%(access_ip_v6)s", - "imageRef" : "%(glance_host)s/images/%(image_id)s", + "imageRef" : "%(image_id)s", "name" : "new-server-test", "metadata" : { "meta_var" : "meta_val" 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 37b06cd0fbb1..25b6415890ba 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" : "%(compute_endpoint)s/images/%(image_id)s", - "flavorRef" : "%(compute_endpoint)s/flavors/1", + "imageRef" : "%(image_id)s", + "flavorRef" : "1", "metadata" : { "My Server Name" : "Apache1" } 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 68c08e2ad46d..788c89627798 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" : "%(compute_endpoint)s/images/%(image_id)s", - "flavorRef" : "%(compute_endpoint)s/flavors/1", + "imageRef" : "%(image_id)s", + "flavorRef" : "1", "metadata" : { "My Server Name" : "Apache1" }, 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 a59726dd3415..25b6415890ba 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 @@ -3,8 +3,8 @@ "accessIPv4": "%(access_ip_v4)s", "accessIPv6": "%(access_ip_v6)s", "name" : "new-server-test", - "imageRef" : "%(glance_host)s/openstack/images/%(image_id)s", - "flavorRef" : "%(compute_endpoint)s/flavors/1", + "imageRef" : "%(image_id)s", + "flavorRef" : "1", "metadata" : { "My Server Name" : "Apache1" } 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 7ca3f724d563..d58133faff38 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" : "%(compute_endpoint)s/images/%(image_id)s", + "imageRef" : "%(image_id)s", "OS-DCF:diskConfig": "AUTO" } } 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 e078e4370c65..cb85465c480d 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" : "%(compute_endpoint)s/images/%(image_id)s", - "flavorRef" : "%(compute_endpoint)s/flavors/1", + "imageRef" : "%(image_id)s", + "flavorRef" : "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-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json.tpl index 4bda8eca1c7e..eb91988dea31 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": "%(compute_endpoint)s/images/%(image_id)s", - "flavorRef": "%(compute_endpoint)s/flavors/1", + "imageRef": "%(image_id)s", + "flavorRef": "1", "metadata": { "My Server Name": "Apache1" }, 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 0901e3afa026..b39dab05d688 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": "%(compute_endpoint)s/images/%(image_id)s", - "flavorRef": "%(compute_endpoint)s/flavors/1", + "imageRef": "%(image_id)s", + "flavorRef": "1", "metadata": { "My Server Name": "Apache1" }, diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-action-rebuild-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-action-rebuild-req.json.tpl index e443ded0d686..89ed4d645677 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-action-rebuild-req.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-action-rebuild-req.json.tpl @@ -2,7 +2,7 @@ "rebuild": { "accessIPv4" : "%(access_ip_v4)s", "accessIPv6" : "%(access_ip_v6)s", - "imageRef": "%(glance_host)s/images/%(image_id)s", + "imageRef": "%(image_id)s", "name": "new-server-test", "metadata": { "meta_var": "meta_val" 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 cbb99a73f298..d797b9c007d2 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": "%(compute_endpoint)s/images/%(image_id)s", - "flavorRef": "%(compute_endpoint)s/flavors/1", + "imageRef": "%(image_id)s", + "flavorRef": "1", "metadata": { "My Server Name": "Apache1" }, diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral.json.tpl index a44806e95394..961a055b3ca5 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral.json.tpl @@ -1,6 +1,6 @@ { "rebuild": { - "imageRef": "%(glance_host)s/images/%(uuid)s", + "imageRef": "%(uuid)s", "name": "%(name)s", "adminPass": "%(pass)s", "metadata": { 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 8fe835431559..a85308a90e72 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 @@ -1,8 +1,8 @@ { "server" : { "name" : "new-server-test", - "imageRef" : "%(glance_host)s/openstack/images/%(image_id)s", - "flavorRef" : "%(compute_endpoint)s/flavors/1" + "imageRef" : "%(image_id)s", + "flavorRef" : "1" }, "OS-SCH-HNT:scheduler_hints": { "same_host": "%(uuid)s" 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 b4f461ad2645..d6a08a2c52eb 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 @@ -3,8 +3,8 @@ "accessIPv4": "%(access_ip_v4)s", "accessIPv6": "%(access_ip_v6)s", "name" : "new-server-test", - "imageRef" : "%(glance_host)s/openstack/images/%(image_id)s", - "flavorRef" : "%(compute_endpoint)s/flavors/1", + "imageRef" : "%(image_id)s", + "flavorRef" : "1", "metadata" : { "My Server Name" : "Apache1" }, 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 6370df85674e..a57dfae32df9 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" : "%(compute_endpoint)s/images/%(image_id)s", - "flavorRef" : "%(compute_endpoint)s/flavors/1", + "imageRef" : "%(image_id)s", + "flavorRef" : "1", "metadata" : { "My Server Name" : "Apache1" }, diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/server-action-rebuild.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/server-action-rebuild.json.tpl index d7e850847710..cceca1f210ae 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/server-action-rebuild.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/server-action-rebuild.json.tpl @@ -2,7 +2,7 @@ "rebuild" : { "accessIPv4" : "%(access_ip_v4)s", "accessIPv6" : "%(access_ip_v6)s", - "imageRef" : "%(glance_host)s/images/%(uuid)s", + "imageRef" : "%(uuid)s", "name" : "%(name)s", "adminPass" : "%(pass)s", "metadata" : { diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/server-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/server-post-req.json.tpl index 84218dc78711..25b6415890ba 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/server-post-req.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/server-post-req.json.tpl @@ -3,8 +3,8 @@ "accessIPv4": "%(access_ip_v4)s", "accessIPv6": "%(access_ip_v6)s", "name" : "new-server-test", - "imageRef" : "%(glance_host)s/images/%(image_id)s", - "flavorRef" : "%(host)s/flavors/1", + "imageRef" : "%(image_id)s", + "flavorRef" : "1", "metadata" : { "My Server Name" : "Apache1" }