openstack/nova
Code Issues Proposed changes

Merge "update API samples to use endpoints"

Browse Source
This commit is contained in:
Jenkins
2015-12-11 06:20:01 +00:00
committed by Gerrit Code Review
parent f660a8068f e31f9a9811
commit 7b70d232e5
90 changed files with 341 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/tests/functional/api_sample_tests/api_samples/all_extensions/flavor-get-resp.json.tpl
View File

@@ -6,11 +6,11 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "http://openstack.example.com/v2/openstack/flavors/1", "href": "%(versioned_compute_endpoint)s/flavors/1",
"rel": "self" "rel": "self"
}, },
{ {
"href": "http://openstack.example.com/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

20
nova/tests/functional/api_sample_tests/api_samples/all_extensions/flavors-detail-resp.json.tpl
View File

@@ -7,11 +7,11 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/flavors/1", "href": "%(versioned_compute_endpoint)s/flavors/1",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
], ],
@@ -29,11 +29,11 @@
"id": "2", "id": "2",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/flavors/2", "href": "%(versioned_compute_endpoint)s/flavors/2",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/flavors/2", "href": "%(compute_endpoint)s/flavors/2",
"rel": "bookmark" "rel": "bookmark"
} }
], ],
@@ -51,11 +51,11 @@
"id": "3", "id": "3",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/flavors/3", "href": "%(versioned_compute_endpoint)s/flavors/3",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/flavors/3", "href": "%(compute_endpoint)s/flavors/3",
"rel": "bookmark" "rel": "bookmark"
} }
], ],
@@ -73,11 +73,11 @@
"id": "4", "id": "4",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/flavors/4", "href": "%(versioned_compute_endpoint)s/flavors/4",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/flavors/4", "href": "%(compute_endpoint)s/flavors/4",
"rel": "bookmark" "rel": "bookmark"
} }
], ],
@@ -95,11 +95,11 @@
"id": "5", "id": "5",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/flavors/5", "href": "%(versioned_compute_endpoint)s/flavors/5",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/flavors/5", "href": "%(compute_endpoint)s/flavors/5",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

20
nova/tests/functional/api_sample_tests/api_samples/all_extensions/flavors-list-resp.json.tpl
View File

@@ -4,11 +4,11 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "http://openstack.example.com/v2/openstack/flavors/1", "href": "%(versioned_compute_endpoint)s/flavors/1",
"rel": "self" "rel": "self"
}, },
{ {
"href": "http://openstack.example.com/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
], ],
@@ -18,11 +18,11 @@
"id": "2", "id": "2",
"links": [ "links": [
{ {
"href": "http://openstack.example.com/v2/openstack/flavors/2", "href": "%(versioned_compute_endpoint)s/flavors/2",
"rel": "self" "rel": "self"
}, },
{ {
"href": "http://openstack.example.com/openstack/flavors/2", "href": "%(compute_endpoint)s/flavors/2",
"rel": "bookmark" "rel": "bookmark"
} }
], ],
@@ -32,11 +32,11 @@
"id": "3", "id": "3",
"links": [ "links": [
{ {
"href": "http://openstack.example.com/v2/openstack/flavors/3", "href": "%(versioned_compute_endpoint)s/flavors/3",
"rel": "self" "rel": "self"
}, },
{ {
"href": "http://openstack.example.com/openstack/flavors/3", "href": "%(compute_endpoint)s/flavors/3",
"rel": "bookmark" "rel": "bookmark"
} }
], ],
@@ -46,11 +46,11 @@
"id": "4", "id": "4",
"links": [ "links": [
{ {
"href": "http://openstack.example.com/v2/openstack/flavors/4", "href": "%(versioned_compute_endpoint)s/flavors/4",
"rel": "self" "rel": "self"
}, },
{ {
"href": "http://openstack.example.com/openstack/flavors/4", "href": "%(compute_endpoint)s/flavors/4",
"rel": "bookmark" "rel": "bookmark"
} }
], ],
@@ -60,11 +60,11 @@
"id": "5", "id": "5",
"links": [ "links": [
{ {
"href": "http://openstack.example.com/v2/openstack/flavors/5", "href": "%(versioned_compute_endpoint)s/flavors/5",
"rel": "self" "rel": "self"
}, },
{ {
"href": "http://openstack.example.com/openstack/flavors/5", "href": "%(compute_endpoint)s/flavors/5",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

8
nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-rebuild-resp.json.tpl
View File

@@ -17,7 +17,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -28,18 +28,18 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
}, },
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

2
nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-rebuild.json.tpl
View File

@@ -1,6 +1,6 @@
{ {
"rebuild" : { "rebuild" : {
"imageRef" : "%(host)s/v2/32278/images/%(uuid)s", "imageRef" : "%(versioned_compute_endpoint)s/images/%(uuid)s",
"name" : "%(name)s", "name" : "%(name)s",
"adminPass" : "%(pass)s", "adminPass" : "%(pass)s",
"accessIPv4" : "%(access_ip_v4)s", "accessIPv4" : "%(access_ip_v4)s",

8
nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-get-resp.json.tpl
View File

@@ -17,7 +17,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -28,7 +28,7 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -36,11 +36,11 @@
"key_name": null, "key_name": null,
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

4
nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-post-resp.json.tpl
View File

@@ -5,11 +5,11 @@
"id": "%(id)s", "id": "%(id)s",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

8
nova/tests/functional/api_sample_tests/api_samples/all_extensions/servers-details-resp.json.tpl
View File

@@ -18,7 +18,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -29,7 +29,7 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -37,11 +37,11 @@
"key_name": null, "key_name": null,
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

4
nova/tests/functional/api_sample_tests/api_samples/all_extensions/servers-list-resp.json.tpl
View File

@@ -4,11 +4,11 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

4
nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-create-resp.json.tpl
View File

@@ -4,11 +4,11 @@
"id": "%(flavor_id)s", "id": "%(flavor_id)s",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/flavors/%(flavor_id)s", "href": "%(versioned_compute_endpoint)s/flavors/%(flavor_id)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/flavors/%(flavor_id)s", "href": "%(compute_endpoint)s/flavors/%(flavor_id)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

20
nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-detail-resp.json.tpl
View File

@@ -7,11 +7,11 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/flavors/1", "href": "%(versioned_compute_endpoint)s/flavors/1",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
], ],
@@ -28,11 +28,11 @@
"id": "2", "id": "2",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/flavors/2", "href": "%(versioned_compute_endpoint)s/flavors/2",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/flavors/2", "href": "%(compute_endpoint)s/flavors/2",
"rel": "bookmark" "rel": "bookmark"
} }
], ],
@@ -49,11 +49,11 @@
"id": "3", "id": "3",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/flavors/3", "href": "%(versioned_compute_endpoint)s/flavors/3",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/flavors/3", "href": "%(compute_endpoint)s/flavors/3",
"rel": "bookmark" "rel": "bookmark"
} }
], ],
@@ -70,11 +70,11 @@
"id": "4", "id": "4",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/flavors/4", "href": "%(versioned_compute_endpoint)s/flavors/4",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/flavors/4", "href": "%(compute_endpoint)s/flavors/4",
"rel": "bookmark" "rel": "bookmark"
} }
], ],
@@ -91,11 +91,11 @@
"id": "5", "id": "5",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/flavors/5", "href": "%(versioned_compute_endpoint)s/flavors/5",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/flavors/5", "href": "%(compute_endpoint)s/flavors/5",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

4
nova/tests/functional/api_sample_tests/api_samples/flavor-access/flavor-access-show-resp.json.tpl
View File

@@ -4,11 +4,11 @@
"id": "%(flavor_id)s", "id": "%(flavor_id)s",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/flavors/%(flavor_id)s", "href": "%(versioned_compute_endpoint)s/flavors/%(flavor_id)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/flavors/%(flavor_id)s", "href": "%(compute_endpoint)s/flavors/%(flavor_id)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

4
nova/tests/functional/api_sample_tests/api_samples/flavor-manage/flavor-create-post-resp.json.tpl
View File

@@ -4,11 +4,11 @@
"id": "%(flavor_id)s", "id": "%(flavor_id)s",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/flavors/%(flavor_id)s", "href": "%(versioned_compute_endpoint)s/flavors/%(flavor_id)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/flavors/%(flavor_id)s", "href": "%(compute_endpoint)s/flavors/%(flavor_id)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

4
nova/tests/functional/api_sample_tests/api_samples/flavors/flavor-get-resp.json.tpl
View File

@@ -4,11 +4,11 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/flavors/1", "href": "%(versioned_compute_endpoint)s/flavors/1",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

20
nova/tests/functional/api_sample_tests/api_samples/flavors/flavors-detail-resp.json.tpl
View File

@@ -7,11 +7,11 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/flavors/1", "href": "%(versioned_compute_endpoint)s/flavors/1",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
], ],
@@ -28,11 +28,11 @@
"id": "2", "id": "2",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/flavors/2", "href": "%(versioned_compute_endpoint)s/flavors/2",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/flavors/2", "href": "%(compute_endpoint)s/flavors/2",
"rel": "bookmark" "rel": "bookmark"
} }
], ],
@@ -49,11 +49,11 @@
"id": "3", "id": "3",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/flavors/3", "href": "%(versioned_compute_endpoint)s/flavors/3",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/flavors/3", "href": "%(compute_endpoint)s/flavors/3",
"rel": "bookmark" "rel": "bookmark"
} }
], ],
@@ -70,11 +70,11 @@
"id": "4", "id": "4",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/flavors/4", "href": "%(versioned_compute_endpoint)s/flavors/4",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/flavors/4", "href": "%(compute_endpoint)s/flavors/4",
"rel": "bookmark" "rel": "bookmark"
} }
], ],
@@ -91,11 +91,11 @@
"id": "5", "id": "5",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/flavors/5", "href": "%(versioned_compute_endpoint)s/flavors/5",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/flavors/5", "href": "%(compute_endpoint)s/flavors/5",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

20
nova/tests/functional/api_sample_tests/api_samples/flavors/flavors-list-resp.json.tpl
View File

@@ -4,11 +4,11 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/flavors/1", "href": "%(versioned_compute_endpoint)s/flavors/1",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
], ],
@@ -18,11 +18,11 @@
"id": "2", "id": "2",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/flavors/2", "href": "%(versioned_compute_endpoint)s/flavors/2",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/flavors/2", "href": "%(compute_endpoint)s/flavors/2",
"rel": "bookmark" "rel": "bookmark"
} }
], ],
@@ -32,11 +32,11 @@
"id": "3", "id": "3",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/flavors/3", "href": "%(versioned_compute_endpoint)s/flavors/3",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/flavors/3", "href": "%(compute_endpoint)s/flavors/3",
"rel": "bookmark" "rel": "bookmark"
} }
], ],
@@ -46,11 +46,11 @@
"id": "4", "id": "4",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/flavors/4", "href": "%(versioned_compute_endpoint)s/flavors/4",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/flavors/4", "href": "%(compute_endpoint)s/flavors/4",
"rel": "bookmark" "rel": "bookmark"
} }
], ],
@@ -60,11 +60,11 @@
"id": "5", "id": "5",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/flavors/5", "href": "%(versioned_compute_endpoint)s/flavors/5",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/flavors/5", "href": "%(compute_endpoint)s/flavors/5",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

4
nova/tests/functional/api_sample_tests/api_samples/images/image-get-resp.json.tpl
View File

@@ -5,11 +5,11 @@
"id": "70a599e0-31e7-49b7-b260-868f441e862b", "id": "70a599e0-31e7-49b7-b260-868f441e862b",
"links": [ "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" "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" "rel": "bookmark"
}, },
{ {

28
nova/tests/functional/api_sample_tests/api_samples/images/images-details-get-resp.json.tpl
View File

@@ -6,11 +6,11 @@
"id": "70a599e0-31e7-49b7-b260-868f441e862b", "id": "70a599e0-31e7-49b7-b260-868f441e862b",
"links": [ "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" "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" "rel": "bookmark"
}, },
{ {
@@ -38,11 +38,11 @@
"id": "155d900f-4e14-4e4c-a73d-069cbf4541e6", "id": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
"links": [ "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" "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" "rel": "bookmark"
}, },
{ {
@@ -69,11 +69,11 @@
"id": "a2459075-d96c-40d5-893e-577ff92e721c", "id": "a2459075-d96c-40d5-893e-577ff92e721c",
"links": [ "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" "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" "rel": "bookmark"
}, },
{ {
@@ -100,11 +100,11 @@
"id": "a440c04b-79fa-479c-bed1-0b816eaec379", "id": "a440c04b-79fa-479c-bed1-0b816eaec379",
"links": [ "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" "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" "rel": "bookmark"
}, },
{ {
@@ -132,11 +132,11 @@
"id": "c905cedb-7281-47e4-8a62-f26bc5fc4c77", "id": "c905cedb-7281-47e4-8a62-f26bc5fc4c77",
"links": [ "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" "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" "rel": "bookmark"
}, },
{ {
@@ -162,11 +162,11 @@
"id": "cedef40a-ed67-4d10-800e-17455edce175", "id": "cedef40a-ed67-4d10-800e-17455edce175",
"links": [ "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" "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" "rel": "bookmark"
}, },
{ {
@@ -192,11 +192,11 @@
"id": "76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", "id": "76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
"links": [ "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" "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" "rel": "bookmark"
}, },
{ {

28
nova/tests/functional/api_sample_tests/api_samples/images/images-list-get-resp.json.tpl
View File

@@ -4,11 +4,11 @@
"id": "70a599e0-31e7-49b7-b260-868f441e862b", "id": "70a599e0-31e7-49b7-b260-868f441e862b",
"links": [ "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" "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" "rel": "bookmark"
}, },
{ {
@@ -23,11 +23,11 @@
"id": "155d900f-4e14-4e4c-a73d-069cbf4541e6", "id": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
"links": [ "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" "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" "rel": "bookmark"
}, },
{ {
@@ -42,11 +42,11 @@
"id": "a2459075-d96c-40d5-893e-577ff92e721c", "id": "a2459075-d96c-40d5-893e-577ff92e721c",
"links": [ "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" "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" "rel": "bookmark"
}, },
{ {
@@ -61,11 +61,11 @@
"id": "a440c04b-79fa-479c-bed1-0b816eaec379", "id": "a440c04b-79fa-479c-bed1-0b816eaec379",
"links": [ "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" "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" "rel": "bookmark"
}, },
{ {
@@ -80,11 +80,11 @@
"id": "c905cedb-7281-47e4-8a62-f26bc5fc4c77", "id": "c905cedb-7281-47e4-8a62-f26bc5fc4c77",
"links": [ "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" "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" "rel": "bookmark"
}, },
{ {
@@ -99,11 +99,11 @@
"id": "cedef40a-ed67-4d10-800e-17455edce175", "id": "cedef40a-ed67-4d10-800e-17455edce175",
"links": [ "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" "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" "rel": "bookmark"
}, },
{ {
@@ -118,11 +118,11 @@
"id": "76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", "id": "76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
"links": [ "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" "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" "rel": "bookmark"
}, },
{ {

8
nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl
View File

@@ -14,7 +14,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -25,18 +25,18 @@
"id": "%(image_id)s", "id": "%(image_id)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(image_id)s", "href": "%(compute_endpoint)s/images/%(image_id)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
}, },
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

8
nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-get-resp.json.tpl
View File

@@ -17,7 +17,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -28,18 +28,18 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
}, },
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

4
nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-post-req.json.tpl
View File

@@ -3,8 +3,8 @@
"accessIPv4": "%(access_ip_v4)s", "accessIPv4": "%(access_ip_v4)s",
"accessIPv6": "%(access_ip_v6)s", "accessIPv6": "%(access_ip_v6)s",
"name" : "new-server-test", "name" : "new-server-test",
"imageRef" : "%(host)s/openstack/images/%(image_id)s", "imageRef" : "%(compute_endpoint)s/images/%(image_id)s",
"flavorRef" : "%(host)s/openstack/flavors/1", "flavorRef" : "%(compute_endpoint)s/flavors/1",
"metadata" : { "metadata" : {
"My Server Name" : "Apache1" "My Server Name" : "Apache1"
} }

4
nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-post-resp.json.tpl
View File

@@ -4,11 +4,11 @@
"id": "%(id)s", "id": "%(id)s",
"links": [ "links": [
{ {
"href": "http://openstack.example.com/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "http://openstack.example.com/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]

8
nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-put-resp.json.tpl
View File

@@ -15,7 +15,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -26,18 +26,18 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
}, },
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

8
nova/tests/functional/api_sample_tests/api_samples/os-access-ips/servers-details-resp.json.tpl
View File

@@ -18,7 +18,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -29,18 +29,18 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
}, },
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(id)s", "href": "%(compute_endpoint)s/servers/%(id)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

4
nova/tests/functional/api_sample_tests/api_samples/os-access-ips/servers-list-resp.json.tpl
View File

@@ -4,11 +4,11 @@
"id": "%(id)s", "id": "%(id)s",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(id)s", "href": "%(versioned_compute_endpoint)s/servers/%(id)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(id)s", "href": "%(compute_endpoint)s/servers/%(id)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

4
nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-post-req.json.tpl
View File

@@ -1,8 +1,8 @@
{ {
"server" : { "server" : {
"name" : "new-server-test", "name" : "new-server-test",
"imageRef" : "%(host)s/openstack/images/%(image_id)s", "imageRef" : "%(compute_endpoint)s/images/%(image_id)s",
"flavorRef" : "%(host)s/openstack/flavors/1", "flavorRef" : "%(compute_endpoint)s/flavors/1",
"metadata" : { "metadata" : {
"My Server Name" : "Apache1" "My Server Name" : "Apache1"
}, },

4
nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-post-resp.json.tpl
View File

@@ -4,11 +4,11 @@
"id": "%(id)s", "id": "%(id)s",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]

8
nova/tests/functional/api_sample_tests/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl
View File

@@ -18,7 +18,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -29,18 +29,18 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
}, },
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

2
nova/tests/functional/api_sample_tests/api_samples/os-config-drive/server-post-req.json.tpl
View File

@@ -4,7 +4,7 @@
"accessIPv6": "%(access_ip_v6)s", "accessIPv6": "%(access_ip_v6)s",
"name" : "new-server-test", "name" : "new-server-test",
"imageRef" : "%(glance_host)s/openstack/images/%(image_id)s", "imageRef" : "%(glance_host)s/openstack/images/%(image_id)s",
"flavorRef" : "%(host)s/openstack/flavors/1", "flavorRef" : "%(compute_endpoint)s/flavors/1",
"metadata" : { "metadata" : {
"My Server Name" : "Apache1" "My Server Name" : "Apache1"
} }

4
nova/tests/functional/api_sample_tests/api_samples/os-config-drive/server-post-resp.json.tpl
View File

@@ -4,11 +4,11 @@
"id": "%(id)s", "id": "%(id)s",
"links": [ "links": [
{ {
"href": "http://openstack.example.com/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "http://openstack.example.com/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]

8
nova/tests/functional/api_sample_tests/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl
View File

@@ -19,7 +19,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -30,18 +30,18 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
}, },
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(id)s", "href": "%(compute_endpoint)s/servers/%(id)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

8
nova/tests/functional/api_sample_tests/api_samples/os-disk-config/list-servers-detail-get.json.tpl
View File

@@ -19,7 +19,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -30,18 +30,18 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
}, },
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(id)s", "href": "%(versioned_compute_endpoint)s/servers/%(id)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(id)s", "href": "%(compute_endpoint)s/servers/%(id)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

2
nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-action-rebuild-req.json.tpl
View File

@@ -1,6 +1,6 @@
{ {
"rebuild": { "rebuild": {
"imageRef" : "%(host)s/openstack/images/%(image_id)s", "imageRef" : "%(compute_endpoint)s/images/%(image_id)s",
"OS-DCF:diskConfig": "AUTO" "OS-DCF:diskConfig": "AUTO"
} }
} }

8
nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-action-rebuild-resp.json.tpl
View File

@@ -17,7 +17,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -28,18 +28,18 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
}, },
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(id)s", "href": "%(versioned_compute_endpoint)s/servers/%(id)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(id)s", "href": "%(compute_endpoint)s/servers/%(id)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

8
nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-get-resp.json.tpl
View File

@@ -18,7 +18,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -29,18 +29,18 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
}, },
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(id)s", "href": "%(versioned_compute_endpoint)s/servers/%(id)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(id)s", "href": "%(compute_endpoint)s/servers/%(id)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

4
nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-post-req.json.tpl
View File

@@ -2,8 +2,8 @@
"server" : { "server" : {
"OS-DCF:diskConfig": "AUTO", "OS-DCF:diskConfig": "AUTO",
"name" : "new-server-test", "name" : "new-server-test",
"imageRef" : "%(host)s/openstack/images/%(image_id)s", "imageRef" : "%(compute_endpoint)s/images/%(image_id)s",
"flavorRef" : "%(host)s/openstack/flavors/1", "flavorRef" : "%(compute_endpoint)s/flavors/1",
"metadata" : { "metadata" : {
"My Server Name" : "Apache1" "My Server Name" : "Apache1"
} }

4
nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-post-resp.json.tpl
View File

@@ -5,11 +5,11 @@
"id": "%(id)s", "id": "%(id)s",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]

8
nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-update-put-resp.json.tpl
View File

@@ -16,7 +16,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -27,18 +27,18 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
}, },
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(id)s", "href": "%(versioned_compute_endpoint)s/servers/%(id)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(id)s", "href": "%(compute_endpoint)s/servers/%(id)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

8
nova/tests/functional/api_sample_tests/api_samples/os-extended-availability-zone/server-get-resp.json.tpl
View File

@@ -19,7 +19,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -30,18 +30,18 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
}, },
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

8
nova/tests/functional/api_sample_tests/api_samples/os-extended-availability-zone/servers-detail-resp.json.tpl
View File

@@ -20,7 +20,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -31,18 +31,18 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
}, },
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(id)s", "href": "%(versioned_compute_endpoint)s/servers/%(id)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(id)s", "href": "%(compute_endpoint)s/servers/%(id)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

8
nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/server-get-resp.json.tpl
View File

@@ -21,7 +21,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -32,18 +32,18 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
}, },
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

8
nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl
View File

@@ -22,7 +22,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -33,18 +33,18 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
}, },
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(id)s", "href": "%(versioned_compute_endpoint)s/servers/%(id)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(id)s", "href": "%(compute_endpoint)s/servers/%(id)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

8
nova/tests/functional/api_sample_tests/api_samples/os-extended-status/server-get-resp.json.tpl
View File

@@ -21,7 +21,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -32,18 +32,18 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
}, },
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

8
nova/tests/functional/api_sample_tests/api_samples/os-extended-status/servers-detail-resp.json.tpl
View File

@@ -22,7 +22,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -33,18 +33,18 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
}, },
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(id)s", "href": "%(versioned_compute_endpoint)s/servers/%(id)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(id)s", "href": "%(compute_endpoint)s/servers/%(id)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

8
nova/tests/functional/api_sample_tests/api_samples/os-extended-volumes/server-get-resp.json.tpl
View File

@@ -17,7 +17,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -28,18 +28,18 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
}, },
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

8
nova/tests/functional/api_sample_tests/api_samples/os-extended-volumes/servers-detail-resp.json.tpl
View File

@@ -19,7 +19,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -30,18 +30,18 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
}, },
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(id)s", "href": "%(versioned_compute_endpoint)s/servers/%(id)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(id)s", "href": "%(compute_endpoint)s/servers/%(id)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

4
nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl
View File

@@ -6,11 +6,11 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "http://openstack.example.com/v2/openstack/flavors/1", "href": "%(versioned_compute_endpoint)s/flavors/1",
"rel": "self" "rel": "self"
}, },
{ {
"href": "http://openstack.example.com/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

20
nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl
View File

@@ -7,11 +7,11 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "http://openstack.example.com/v2/openstack/flavors/1", "href": "%(versioned_compute_endpoint)s/flavors/1",
"rel": "self" "rel": "self"
}, },
{ {
"href": "http://openstack.example.com/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
], ],
@@ -29,11 +29,11 @@
"id": "2", "id": "2",
"links": [ "links": [
{ {
"href": "http://openstack.example.com/v2/openstack/flavors/2", "href": "%(versioned_compute_endpoint)s/flavors/2",
"rel": "self" "rel": "self"
}, },
{ {
"href": "http://openstack.example.com/openstack/flavors/2", "href": "%(compute_endpoint)s/flavors/2",
"rel": "bookmark" "rel": "bookmark"
} }
], ],
@@ -51,11 +51,11 @@
"id": "3", "id": "3",
"links": [ "links": [
{ {
"href": "http://openstack.example.com/v2/openstack/flavors/3", "href": "%(versioned_compute_endpoint)s/flavors/3",
"rel": "self" "rel": "self"
}, },
{ {
"href": "http://openstack.example.com/openstack/flavors/3", "href": "%(compute_endpoint)s/flavors/3",
"rel": "bookmark" "rel": "bookmark"
} }
], ],
@@ -73,11 +73,11 @@
"id": "4", "id": "4",
"links": [ "links": [
{ {
"href": "http://openstack.example.com/v2/openstack/flavors/4", "href": "%(versioned_compute_endpoint)s/flavors/4",
"rel": "self" "rel": "self"
}, },
{ {
"href": "http://openstack.example.com/openstack/flavors/4", "href": "%(compute_endpoint)s/flavors/4",
"rel": "bookmark" "rel": "bookmark"
} }
], ],
@@ -95,11 +95,11 @@
"id": "5", "id": "5",
"links": [ "links": [
{ {
"href": "http://openstack.example.com/v2/openstack/flavors/5", "href": "%(versioned_compute_endpoint)s/flavors/5",
"rel": "self" "rel": "self"
}, },
{ {
"href": "http://openstack.example.com/openstack/flavors/5", "href": "%(compute_endpoint)s/flavors/5",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

4
nova/tests/functional/api_sample_tests/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl
View File

@@ -4,11 +4,11 @@
"id": "%(flavor_id)s", "id": "%(flavor_id)s",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/flavors/%(flavor_id)s", "href": "%(versioned_compute_endpoint)s/flavors/%(flavor_id)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/flavors/%(flavor_id)s", "href": "%(compute_endpoint)s/flavors/%(flavor_id)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

8
nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/server-get-resp.json.tpl
View File

@@ -9,7 +9,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -20,7 +20,7 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -28,11 +28,11 @@
"key_name": null, "key_name": null,
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

8
nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl
View File

@@ -9,7 +9,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -20,7 +20,7 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -28,11 +28,11 @@
"key_name": null, "key_name": null,
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(id)s", "href": "%(compute_endpoint)s/servers/%(id)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

4
nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/servers-list-resp.json.tpl
View File

@@ -4,11 +4,11 @@
"id": "%(id)s", "id": "%(id)s",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(id)s", "href": "%(versioned_compute_endpoint)s/servers/%(id)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(id)s", "href": "%(compute_endpoint)s/servers/%(id)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

4
nova/tests/functional/api_sample_tests/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json.tpl
View File

@@ -1,8 +1,8 @@
{ {
"server": { "server": {
"name": "new-server-test", "name": "new-server-test",
"imageRef": "%(host)s/openstack/images/%(image_id)s", "imageRef": "%(compute_endpoint)s/images/%(image_id)s",
"flavorRef": "%(host)s/openstack/flavors/1", "flavorRef": "%(compute_endpoint)s/flavors/1",
"metadata": { "metadata": {
"My Server Name": "Apache1" "My Server Name": "Apache1"
}, },

4
nova/tests/functional/api_sample_tests/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json.tpl
View File

@@ -4,11 +4,11 @@
"id": "%(id)s", "id": "%(id)s",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]

4
nova/tests/functional/api_sample_tests/api_samples/os-multiple-create/multiple-create-post-req.json.tpl
View File

@@ -1,8 +1,8 @@
{ {
"server": { "server": {
"name": "new-server-test", "name": "new-server-test",
"imageRef": "%(host)s/openstack/images/%(image_id)s", "imageRef": "%(compute_endpoint)s/images/%(image_id)s",
"flavorRef": "%(host)s/openstack/flavors/1", "flavorRef": "%(compute_endpoint)s/flavors/1",
"metadata": { "metadata": {
"My Server Name": "Apache1" "My Server Name": "Apache1"
}, },

8
nova/tests/functional/api_sample_tests/api_samples/os-personality/server-action-rebuild-resp.json.tpl
View File

@@ -16,7 +16,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -27,18 +27,18 @@
"id": "%(image_id)s", "id": "%(image_id)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(image_id)s", "href": "%(compute_endpoint)s/images/%(image_id)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
}, },
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

4
nova/tests/functional/api_sample_tests/api_samples/os-personality/server-post-req.json.tpl
View File

@@ -1,8 +1,8 @@
{ {
"server": { "server": {
"name": "new-server-test", "name": "new-server-test",
"imageRef": "%(host)s/openstack/images/%(image_id)s", "imageRef": "%(compute_endpoint)s/images/%(image_id)s",
"flavorRef": "%(host)s/openstack/flavors/1", "flavorRef": "%(compute_endpoint)s/flavors/1",
"metadata": { "metadata": {
"My Server Name": "Apache1" "My Server Name": "Apache1"
}, },

4
nova/tests/functional/api_sample_tests/api_samples/os-personality/server-post-resp.json.tpl
View File

@@ -4,11 +4,11 @@
"id": "%(id)s", "id": "%(id)s",
"links": [ "links": [
{ {
"href": "http://openstack.example.com/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "http://openstack.example.com/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]

8
nova/tests/functional/api_sample_tests/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json.tpl
View File

@@ -16,7 +16,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -27,18 +27,18 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
}, },
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

8
nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-rescue.json.tpl
View File

@@ -17,7 +17,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -28,18 +28,18 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
}, },
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(id)s", "href": "%(versioned_compute_endpoint)s/servers/%(id)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(id)s", "href": "%(compute_endpoint)s/servers/%(id)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

8
nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-unrescue.json.tpl
View File

@@ -17,7 +17,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -28,18 +28,18 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
}, },
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(id)s", "href": "%(versioned_compute_endpoint)s/servers/%(id)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(id)s", "href": "%(compute_endpoint)s/servers/%(id)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

2
nova/tests/functional/api_sample_tests/api_samples/os-scheduler-hints/scheduler-hints-post-req.json.tpl
View File

@@ -2,7 +2,7 @@
"server" : { "server" : {
"name" : "new-server-test", "name" : "new-server-test",
"imageRef" : "%(glance_host)s/openstack/images/%(image_id)s", "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": { "OS-SCH-HNT:scheduler_hints": {
"same_host": "%(uuid)s" "same_host": "%(uuid)s"

4
nova/tests/functional/api_sample_tests/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json.tpl
View File

@@ -4,11 +4,11 @@
"id": "%(id)s", "id": "%(id)s",
"links": [ "links": [
{ {
"href": "http://openstack.example.com/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "http://openstack.example.com/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]

8
nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-get-resp.json.tpl
View File

@@ -17,7 +17,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -28,18 +28,18 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
}, },
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

2
nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-post-req.json.tpl
View File

@@ -4,7 +4,7 @@
"accessIPv6": "%(access_ip_v6)s", "accessIPv6": "%(access_ip_v6)s",
"name" : "new-server-test", "name" : "new-server-test",
"imageRef" : "%(glance_host)s/openstack/images/%(image_id)s", "imageRef" : "%(glance_host)s/openstack/images/%(image_id)s",
"flavorRef" : "%(host)s/openstack/flavors/1", "flavorRef" : "%(compute_endpoint)s/flavors/1",
"metadata" : { "metadata" : {
"My Server Name" : "Apache1" "My Server Name" : "Apache1"
}, },

4
nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-post-resp.json.tpl
View File

@@ -4,11 +4,11 @@
"id": "%(id)s", "id": "%(id)s",
"links": [ "links": [
{ {
"href": "http://openstack.example.com/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "http://openstack.example.com/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

8
nova/tests/functional/api_sample_tests/api_samples/os-security-groups/servers-detail-resp.json.tpl
View File

@@ -19,7 +19,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -30,18 +30,18 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
}, },
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(id)s", "href": "%(versioned_compute_endpoint)s/servers/%(id)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(id)s", "href": "%(compute_endpoint)s/servers/%(id)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

8
nova/tests/functional/api_sample_tests/api_samples/os-server-usage/server-get-resp.json.tpl
View File

@@ -19,7 +19,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -30,7 +30,7 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -38,11 +38,11 @@
"key_name": null, "key_name": null,
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

8
nova/tests/functional/api_sample_tests/api_samples/os-server-usage/servers-detail-resp.json.tpl
View File

@@ -20,11 +20,11 @@
"key_name": null, "key_name": null,
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(id)s", "href": "%(compute_endpoint)s/servers/%(id)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],
@@ -34,7 +34,7 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -47,7 +47,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]

4
nova/tests/functional/api_sample_tests/api_samples/os-user-data/userdata-post-req.json.tpl
View File

@@ -1,8 +1,8 @@
{ {
"server" : { "server" : {
"name" : "new-server-test", "name" : "new-server-test",
"imageRef" : "%(host)s/openstack/images/%(image_id)s", "imageRef" : "%(compute_endpoint)s/images/%(image_id)s",
"flavorRef" : "%(host)s/openstack/flavors/1", "flavorRef" : "%(compute_endpoint)s/flavors/1",
"metadata" : { "metadata" : {
"My Server Name" : "Apache1" "My Server Name" : "Apache1"
}, },

4
nova/tests/functional/api_sample_tests/api_samples/os-user-data/userdata-post-resp.json.tpl
View File

@@ -4,11 +4,11 @@
"id": "%(id)s", "id": "%(id)s",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]

4
nova/tests/functional/api_sample_tests/api_samples/servers-sort/server-sort-keys-list-resp.json.tpl
View File

@@ -4,11 +4,11 @@
"id": "%(id)s", "id": "%(id)s",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(id)s", "href": "%(versioned_compute_endpoint)s/servers/%(id)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(id)s", "href": "%(compute_endpoint)s/servers/%(id)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

8
nova/tests/functional/api_sample_tests/api_samples/servers/server-action-rebuild-resp.json.tpl
View File

@@ -16,7 +16,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -27,18 +27,18 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
}, },
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

8
nova/tests/functional/api_sample_tests/api_samples/servers/server-get-resp.json.tpl
View File

@@ -17,7 +17,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -28,7 +28,7 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -36,11 +36,11 @@
"key_name": null, "key_name": null,
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

4
nova/tests/functional/api_sample_tests/api_samples/servers/server-post-resp.json.tpl
View File

@@ -4,11 +4,11 @@
"id": "%(id)s", "id": "%(id)s",
"links": [ "links": [
{ {
"href": "http://openstack.example.com/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "http://openstack.example.com/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]

8
nova/tests/functional/api_sample_tests/api_samples/servers/servers-details-resp.json.tpl
View File

@@ -18,7 +18,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -29,7 +29,7 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -37,11 +37,11 @@
"key_name": null, "key_name": null,
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(id)s", "href": "%(compute_endpoint)s/servers/%(id)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

4
nova/tests/functional/api_sample_tests/api_samples/servers/servers-list-resp.json.tpl
View File

@@ -4,11 +4,11 @@
"id": "%(id)s", "id": "%(id)s",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(id)s", "href": "%(versioned_compute_endpoint)s/servers/%(id)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(id)s", "href": "%(compute_endpoint)s/servers/%(id)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

8
nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/server-get-resp.json.tpl
View File

@@ -17,7 +17,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -28,7 +28,7 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -36,11 +36,11 @@
"key_name": null, "key_name": null,
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(uuid)s", "href": "%(compute_endpoint)s/servers/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

8
nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-details-resp.json.tpl
View File

@@ -18,7 +18,7 @@
"id": "1", "id": "1",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/flavors/1", "href": "%(compute_endpoint)s/flavors/1",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -29,7 +29,7 @@
"id": "%(uuid)s", "id": "%(uuid)s",
"links": [ "links": [
{ {
"href": "%(host)s/openstack/images/%(uuid)s", "href": "%(compute_endpoint)s/images/%(uuid)s",
"rel": "bookmark" "rel": "bookmark"
} }
] ]
@@ -37,11 +37,11 @@
"key_name": null, "key_name": null,
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(uuid)s", "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(id)s", "href": "%(compute_endpoint)s/servers/%(id)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

4
nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-list-resp.json.tpl
View File

@@ -4,11 +4,11 @@
"id": "%(id)s", "id": "%(id)s",
"links": [ "links": [
{ {
"href": "%(host)s/v2/openstack/servers/%(id)s", "href": "%(versioned_compute_endpoint)s/servers/%(id)s",
"rel": "self" "rel": "self"
}, },
{ {
"href": "%(host)s/openstack/servers/%(id)s", "href": "%(compute_endpoint)s/servers/%(id)s",
"rel": "bookmark" "rel": "bookmark"
} }
], ],

2
nova/tests/functional/api_sample_tests/api_samples/versions/v2-version-get-resp.json.tpl
View File

@@ -3,7 +3,7 @@
"id": "v2.0", "id": "v2.0",
"links": [ "links": [
{ {
"href": "http://openstack.example.com/v2/", "href": "%(host)s/v2/",
"rel": "self" "rel": "self"
}, },
{ {

2
nova/tests/functional/api_sample_tests/api_samples/versions/v21-version-get-resp.json.tpl
View File

@@ -3,7 +3,7 @@
"id": "v2.1", "id": "v2.1",
"links": [ "links": [
{ {
"href": "http://openstack.example.com/v2.1/", "href": "%(host)s/v2.1/",
"rel": "self" "rel": "self"
}, },
{ {

4
nova/tests/functional/api_sample_tests/api_samples/versions/versions-get-resp.json.tpl
View File

@@ -4,7 +4,7 @@
"id": "v2.0", "id": "v2.0",
"links": [ "links": [
{ {
"href": "http://openstack.example.com/v2/", "href": "%(host)s/v2/",
"rel": "self" "rel": "self"
} }
], ],
@@ -17,7 +17,7 @@
"id": "v2.1", "id": "v2.1",
"links": [ "links": [
{ {
"href": "http://openstack.example.com/v2.1/", "href": "%(host)s/v2.1/",
"rel": "self" "rel": "self"
} }
], ],

10
nova/tests/functional/api_sample_tests/test_access_ips.py
View File

@@ -46,7 +46,7 @@ class AccessIPsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21):
def test_servers_post(self): def test_servers_post(self):
subs = { subs = {
'image_id': fake.get_valid_image_id(), '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_v4': '1.2.3.4',
'access_ip_v6': 'fe80::' 'access_ip_v6': 'fe80::'
} }
@@ -55,7 +55,7 @@ class AccessIPsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21):
def test_servers_get(self): def test_servers_get(self):
subs = { subs = {
'image_id': fake.get_valid_image_id(), '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_v4': '1.2.3.4',
'access_ip_v6': 'fe80::' 'access_ip_v6': 'fe80::'
} }
@@ -68,7 +68,7 @@ class AccessIPsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21):
def test_servers_details(self): def test_servers_details(self):
subs = { subs = {
'image_id': fake.get_valid_image_id(), '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_v4': '1.2.3.4',
'access_ip_v6': 'fe80::' 'access_ip_v6': 'fe80::'
} }
@@ -81,7 +81,7 @@ class AccessIPsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21):
def test_servers_rebuild(self): def test_servers_rebuild(self):
subs = { subs = {
'image_id': fake.get_valid_image_id(), '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_v4': '1.2.3.4',
'access_ip_v6': 'fe80::' 'access_ip_v6': 'fe80::'
} }
@@ -98,7 +98,7 @@ class AccessIPsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21):
def test_servers_update(self): def test_servers_update(self):
subs = { subs = {
'image_id': fake.get_valid_image_id(), '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_v4': '1.2.3.4',
'access_ip_v6': 'fe80::' 'access_ip_v6': 'fe80::'
} }

2
nova/tests/functional/api_sample_tests/test_disk_config.py
View File

@@ -85,7 +85,7 @@ class DiskConfigJsonTest(test_servers.ServersSampleBase):
uuid = self._post_server(use_common_server_api_samples=False) uuid = self._post_server(use_common_server_api_samples=False)
subs = { subs = {
'image_id': fake.get_valid_image_id(), '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, response = self._do_post('servers/%s/action' % uuid,
'server-action-rebuild-req', subs) 'server-action-rebuild-req', subs)

4
nova/tests/functional/api_sample_tests/test_multiple_create.py
View File

@@ -37,7 +37,7 @@ class MultipleCreateJsonTest(test_servers.ServersSampleBase):
def test_multiple_create(self): def test_multiple_create(self):
subs = { subs = {
'image_id': fake.get_valid_image_id(), 'image_id': fake.get_valid_image_id(),
'host': self._get_host(), 'compute_endpoint': self._get_compute_endpoint(),
'min_count': "2", 'min_count': "2",
'max_count': "3" 'max_count': "3"
} }
@@ -48,7 +48,7 @@ class MultipleCreateJsonTest(test_servers.ServersSampleBase):
def test_multiple_create_without_reservation_id(self): def test_multiple_create_without_reservation_id(self):
subs = { subs = {
'image_id': fake.get_valid_image_id(), 'image_id': fake.get_valid_image_id(),
'host': self._get_host(), 'compute_endpoint': self._get_compute_endpoint(),
'min_count': "2", 'min_count': "2",
'max_count': "3" 'max_count': "3"
} }

22
nova/tests/functional/api_sample_tests/test_servers.py
View File

@@ -36,6 +36,8 @@ class ServersSampleBase(api_sample_base.ApiSampleTestBaseV21):
subs = { subs = {
'image_id': fake.get_valid_image_id(), 'image_id': fake.get_valid_image_id(),
'host': self._get_host(), 'host': self._get_host(),
'compute_endpoint': self._get_compute_endpoint(),
'versioned_compute_endpoint': self._get_vers_compute_endpoint(),
'glance_host': self._get_glance_host(), 'glance_host': self._get_glance_host(),
'access_ip_v4': '1.2.3.4', 'access_ip_v4': '1.2.3.4',
'access_ip_v6': '80fe::' 'access_ip_v6': '80fe::'
@@ -174,14 +176,18 @@ class ServersActionsJsonTest(ServersSampleBase):
def test_server_rebuild(self): def test_server_rebuild(self):
uuid = self._post_server() uuid = self._post_server()
image = fake.get_valid_image_id() image = fake.get_valid_image_id()
subs = {'host': self._get_host(), subs = {
'uuid': image, 'host': self._get_host(),
'name': 'foobar', 'compute_endpoint': self._get_compute_endpoint(),
'pass': 'seekr3t', 'versioned_compute_endpoint': self._get_vers_compute_endpoint(),
'hostid': '[a-f0-9]+', 'uuid': image,
'access_ip_v4': '1.2.3.4', 'name': 'foobar',
'access_ip_v6': '80fe::', 'pass': 'seekr3t',
} 'hostid': '[a-f0-9]+',
'access_ip_v4': '1.2.3.4',
'access_ip_v6': '80fe::',
}
self._test_server_action(uuid, 'rebuild', self._test_server_action(uuid, 'rebuild',
'server-action-rebuild', 'server-action-rebuild',
subs, subs,

2
nova/tests/functional/api_sample_tests/test_user_data.py
View File

@@ -39,7 +39,7 @@ class UserDataJsonTest(api_sample_base.ApiSampleTestBaseV21):
user_data = base64.b64encode(user_data_contents) user_data = base64.b64encode(user_data_contents)
subs = { subs = {
'image_id': fake.get_valid_image_id(), 'image_id': fake.get_valid_image_id(),
'host': self._get_host(), 'compute_endpoint': self._get_compute_endpoint(),
'user_data': user_data 'user_data': user_data
} }
response = self._do_post('servers', 'userdata-post-req', subs) response = self._do_post('servers', 'userdata-post-req', subs)

13
nova/tests/functional/api_samples_test_base.py
View File

@@ -335,8 +335,21 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase):
'text': text, 'text': text,
'int': '[0-9]+', 'int': '[0-9]+',
'user_id': text, '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, def _get_response(self, url, method, body=None, strip_version=False,
api_version=None, headers=None): api_version=None, headers=None):
headers = headers or {} headers = headers or {}