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

@@ -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",

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",
+        "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavorRef" : "http://openstack.example.com/flavors/1",
+        "flavorRef" : "1",
         "metadata" : {
             "My Server Name" : "Apache1"
         }

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"

doc/api_samples/os-access-ips/server-post-req.json

@@ -3,8 +3,8 @@
         "accessIPv4": "1.2.3.4",
         "accessIPv6": "fe80::",
         "name" : "new-server-test",
-        "imageRef" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavorRef" : "http://openstack.example.com/openstack/flavors/1",
+        "flavorRef" : "1",
         "metadata" : {
             "My Server Name" : "Apache1"
         }

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",
+        "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavorRef" : "http://openstack.example.com/openstack/flavors/1",
+        "flavorRef" : "1",
         "metadata" : {
             "My Server Name" : "Apache1"
         },

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",
+        "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavorRef" : "http://openstack.example.com/openstack/flavors/1",
+        "flavorRef" : "1",
         "metadata" : {
             "My Server Name" : "Apache1"
         }

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"
     }
 }

doc/api_samples/os-disk-config/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",
+        "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavorRef" : "http://openstack.example.com/openstack/flavors/1",
+        "flavorRef" : "1",
         "metadata" : {
             "My Server Name" : "Apache1"
         }

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",
+        "imageRef": "70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavorRef": "http://openstack.example.com/openstack/flavors/1",
+        "flavorRef": "1",
         "metadata": {
             "My Server Name": "Apache1"
         },

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",
+        "imageRef": "70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavorRef": "http://openstack.example.com/openstack/flavors/1",
+        "flavorRef": "1",
         "metadata": {
             "My Server Name": "Apache1"
         },

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"

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",
+        "imageRef": "70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavorRef": "http://openstack.example.com/openstack/flavors/1",
+        "flavorRef": "1",
         "metadata": {
             "My Server Name": "Apache1"
         },

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": {

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",
+        "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavorRef" : "http://openstack.example.com/openstack/flavors/1"
+        "flavorRef" : "1"
     },
     "OS-SCH-HNT:scheduler_hints": {
         "same_host": "48e6a9f6-30af-47e0-bc04-acaed113bb4e"

doc/api_samples/os-security-groups/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",
+        "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavorRef" : "http://openstack.example.com/openstack/flavors/1",
+        "flavorRef" : "1",
         "metadata" : {
             "My Server Name" : "Apache1"
         },

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",
+        "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavorRef" : "http://openstack.example.com/openstack/flavors/1",
+        "flavorRef" : "1",
         "metadata" : {
             "My Server Name" : "Apache1"
         },

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" : {

doc/api_samples/servers/server-action-rebuild.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" : "foobar",
         "adminPass" : "seekr3t",
         "metadata" : {

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",
+        "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavorRef" : "http://openstack.example.com/flavors/1",
+        "flavorRef" : "1",
         "metadata" : {
             "My Server Name" : "Apache1"
         }

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",

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",
+        "imageRef" : "%(image_id)s",
-        "flavorRef" : "%(host)s/flavors/1",
+        "flavorRef" : "1",
         "metadata" : {
             "My Server Name" : "Apache1"
         }

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"

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",
+        "imageRef" : "%(image_id)s",
-        "flavorRef" : "%(compute_endpoint)s/flavors/1",
+        "flavorRef" : "1",
         "metadata" : {
             "My Server Name" : "Apache1"
         }

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",
+        "imageRef" : "%(image_id)s",
-        "flavorRef" : "%(compute_endpoint)s/flavors/1",
+        "flavorRef" : "1",
         "metadata" : {
             "My Server Name" : "Apache1"
         },

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",
+        "imageRef" : "%(image_id)s",
-        "flavorRef" : "%(compute_endpoint)s/flavors/1",
+        "flavorRef" : "1",
         "metadata" : {
             "My Server Name" : "Apache1"
         }

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"
     }
 }

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",
+        "imageRef" : "%(image_id)s",
-        "flavorRef" : "%(compute_endpoint)s/flavors/1",
+        "flavorRef" : "1",
         "metadata" : {
             "My Server Name" : "Apache1"
         }

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",
+        "imageRef": "%(image_id)s",
-        "flavorRef": "%(compute_endpoint)s/flavors/1",
+        "flavorRef": "1",
         "metadata": {
             "My Server Name": "Apache1"
         },

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",
+        "imageRef": "%(image_id)s",
-        "flavorRef": "%(compute_endpoint)s/flavors/1",
+        "flavorRef": "1",
         "metadata": {
             "My Server Name": "Apache1"
         },

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"

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",
+        "imageRef": "%(image_id)s",
-        "flavorRef": "%(compute_endpoint)s/flavors/1",
+        "flavorRef": "1",
         "metadata": {
             "My Server Name": "Apache1"
         },

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": {

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",
+        "imageRef" : "%(image_id)s",
-        "flavorRef" : "%(compute_endpoint)s/flavors/1"
+        "flavorRef" : "1"
     },
     "OS-SCH-HNT:scheduler_hints": {
         "same_host": "%(uuid)s"

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",
+        "imageRef" : "%(image_id)s",
-        "flavorRef" : "%(compute_endpoint)s/flavors/1",
+        "flavorRef" : "1",
         "metadata" : {
             "My Server Name" : "Apache1"
         },

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",
+        "imageRef" : "%(image_id)s",
-        "flavorRef" : "%(compute_endpoint)s/flavors/1",
+        "flavorRef" : "1",
         "metadata" : {
             "My Server Name" : "Apache1"
         },

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" : {

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",
+        "imageRef" : "%(image_id)s",
-        "flavorRef" : "%(host)s/flavors/1",
+        "flavorRef" : "1",
         "metadata" : {
             "My Server Name" : "Apache1"
         }