diff --git a/doc/api_samples/OS-DCF/image-get-resp.json b/doc/api_samples/OS-DCF/image-get-resp.json deleted file mode 100644 index 9105de415f..0000000000 --- a/doc/api_samples/OS-DCF/image-get-resp.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "image": { - "OS-DCF:diskConfig": "AUTO", - "created": "2011-01-01T01:02:03Z", - "id": "70a599e0-31e7-49b7-b260-868f441e862b", - "links": [ - { - "href": "http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "self" - }, - { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "bookmark" - }, - { - "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "alternate", - "type": "application/vnd.openstack.image" - } - ], - "metadata": { - "architecture": "x86_64", - "auto_disk_config": "True", - "kernel_id": "nokernel", - "ramdisk_id": "nokernel" - }, - "minDisk": 0, - "minRam": 0, - "name": "fakeimage7", - "progress": 100, - "status": "ACTIVE", - "updated": "2011-01-01T01:02:03Z" - } -} diff --git a/doc/api_samples/OS-DCF/image-list-resp.json b/doc/api_samples/OS-DCF/image-list-resp.json deleted file mode 100644 index d3fa4d567e..0000000000 --- a/doc/api_samples/OS-DCF/image-list-resp.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "images": [ - { - "OS-DCF:diskConfig": "AUTO", - "created": "2011-01-01T01:02:03Z", - "id": "70a599e0-31e7-49b7-b260-868f441e862b", - "links": [ - { - "href": "http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "self" - }, - { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "bookmark" - }, - { - "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "alternate", - "type": "application/vnd.openstack.image" - } - ], - "metadata": { - "architecture": "x86_64", - "auto_disk_config": "True", - "kernel_id": "nokernel", - "ramdisk_id": "nokernel" - }, - "minDisk": 0, - "minRam": 0, - "name": "fakeimage7", - "progress": 100, - "status": "ACTIVE", - "updated": "2011-01-01T01:02:03Z" - }, - { - "created": "2011-01-01T01:02:03Z", - "id": "155d900f-4e14-4e4c-a73d-069cbf4541e6", - "links": [ - { - "href": "http://openstack.example.com/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", - "rel": "self" - }, - { - "href": "http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", - "rel": "bookmark" - }, - { - "href": "http://glance.openstack.example.com/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", - "rel": "alternate", - "type": "application/vnd.openstack.image" - } - ], - "metadata": { - "architecture": "x86_64", - "kernel_id": "nokernel", - "ramdisk_id": "nokernel" - }, - "minDisk": 0, - "minRam": 0, - "name": "fakeimage123456", - "progress": 100, - "status": "ACTIVE", - "updated": "2011-01-01T01:02:03Z" - }, - { - "created": "2011-01-01T01:02:03Z", - "id": "a2459075-d96c-40d5-893e-577ff92e721c", - "links": [ - { - "href": "http://openstack.example.com/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", - "rel": "self" - }, - { - "href": "http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", - "rel": "bookmark" - }, - { - "href": "http://glance.openstack.example.com/images/a2459075-d96c-40d5-893e-577ff92e721c", - "rel": "alternate", - "type": "application/vnd.openstack.image" - } - ], - "metadata": { - "kernel_id": "nokernel", - "ramdisk_id": "nokernel" - }, - "minDisk": 0, - "minRam": 0, - "name": "fakeimage123456", - "progress": 100, - "status": "ACTIVE", - "updated": "2011-01-01T01:02:03Z" - }, - { - "OS-DCF:diskConfig": "MANUAL", - "created": "2011-01-01T01:02:03Z", - "id": "a440c04b-79fa-479c-bed1-0b816eaec379", - "links": [ - { - "href": "http://openstack.example.com/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", - "rel": "self" - }, - { - "href": "http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", - "rel": "bookmark" - }, - { - "href": "http://glance.openstack.example.com/images/a440c04b-79fa-479c-bed1-0b816eaec379", - "rel": "alternate", - "type": "application/vnd.openstack.image" - } - ], - "metadata": { - "architecture": "x86_64", - "auto_disk_config": "False", - "kernel_id": "nokernel", - "ramdisk_id": "nokernel" - }, - "minDisk": 0, - "minRam": 0, - "name": "fakeimage6", - "progress": 100, - "status": "ACTIVE", - "updated": "2011-01-01T01:02:03Z" - }, - { - "created": "2011-01-01T01:02:03Z", - "id": "c905cedb-7281-47e4-8a62-f26bc5fc4c77", - "links": [ - { - "href": "http://openstack.example.com/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", - "rel": "self" - }, - { - "href": "http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", - "rel": "bookmark" - }, - { - "href": "http://glance.openstack.example.com/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", - "rel": "alternate", - "type": "application/vnd.openstack.image" - } - ], - "metadata": { - "kernel_id": "155d900f-4e14-4e4c-a73d-069cbf4541e6", - "ramdisk_id": null - }, - "minDisk": 0, - "minRam": 0, - "name": "fakeimage123456", - "progress": 100, - "status": "ACTIVE", - "updated": "2011-01-01T01:02:03Z" - }, - { - "created": "2011-01-01T01:02:03Z", - "id": "cedef40a-ed67-4d10-800e-17455edce175", - "links": [ - { - "href": "http://openstack.example.com/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", - "rel": "self" - }, - { - "href": "http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", - "rel": "bookmark" - }, - { - "href": "http://glance.openstack.example.com/images/cedef40a-ed67-4d10-800e-17455edce175", - "rel": "alternate", - "type": "application/vnd.openstack.image" - } - ], - "metadata": { - "kernel_id": "nokernel", - "ramdisk_id": "nokernel" - }, - "minDisk": 0, - "minRam": 0, - "name": "fakeimage123456", - "progress": 100, - "status": "ACTIVE", - "updated": "2011-01-01T01:02:03Z" - }, - { - "created": "2011-01-01T01:02:03Z", - "id": "76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", - "links": [ - { - "href": "http://openstack.example.com/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", - "rel": "self" - }, - { - "href": "http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", - "rel": "bookmark" - }, - { - "href": "http://glance.openstack.example.com/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", - "rel": "alternate", - "type": "application/vnd.openstack.image" - } - ], - "metadata": { - "kernel_id": "nokernel", - "ramdisk_id": "nokernel" - }, - "minDisk": 0, - "minRam": 0, - "name": "fakeimage123456", - "progress": 100, - "status": "ACTIVE", - "updated": "2011-01-01T01:02:03Z" - } - ] -} diff --git a/doc/api_samples/OS-DCF/list-servers-detail-get.json b/doc/api_samples/OS-DCF/list-servers-detail-get.json deleted file mode 100644 index 7aea51e195..0000000000 --- a/doc/api_samples/OS-DCF/list-servers-detail-get.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "servers": [ - { - "OS-DCF:diskConfig": "AUTO", - "accessIPv4": "", - "accessIPv6": "", - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "version": 4 - } - ] - }, - "created": "2012-12-02T02:11:55Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/openstack/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "99428f32351a5d89d0f7727c6eec68c1777c545a0972aaac645508dc", - "id": "05372e62-05b9-4ee2-9343-9a1fdf2a5fda", - "image": { - "id": "70a599e0-31e7-49b7-b260-868f441e862b", - "links": [ - { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "bookmark" - } - ] - }, - "links": [ - { - "href": "http://openstack.example.com/v2/openstack/servers/05372e62-05b9-4ee2-9343-9a1fdf2a5fda", - "rel": "self" - }, - { - "href": "http://openstack.example.com/openstack/servers/05372e62-05b9-4ee2-9343-9a1fdf2a5fda", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "openstack", - "updated": "2012-12-02T02:11:56Z", - "user_id": "fake" - } - ] -} \ No newline at end of file diff --git a/doc/api_samples/OS-DCF/server-action-rebuild-req.json b/doc/api_samples/OS-DCF/server-action-rebuild-req.json deleted file mode 100644 index 514607f6d2..0000000000 --- a/doc/api_samples/OS-DCF/server-action-rebuild-req.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "rebuild": { - "imageRef" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", - "OS-DCF:diskConfig": "AUTO" - } -} \ No newline at end of file diff --git a/doc/api_samples/OS-DCF/server-action-rebuild-resp.json b/doc/api_samples/OS-DCF/server-action-rebuild-resp.json deleted file mode 100644 index 24e1e5d042..0000000000 --- a/doc/api_samples/OS-DCF/server-action-rebuild-resp.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "server": { - "OS-DCF:diskConfig": "AUTO", - "accessIPv4": "", - "accessIPv6": "", - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "version": 4 - } - ] - }, - "adminPass": "NBjMaJoFL4EF", - "created": "2012-12-02T02:11:56Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/openstack/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "c076393ad900d62c4805a42df10d9b364f629842681c00cce035487f", - "id": "63a8aa13-60fe-41c4-b079-77f6fdf3c841", - "image": { - "id": "70a599e0-31e7-49b7-b260-868f441e862b", - "links": [ - { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "bookmark" - } - ] - }, - "links": [ - { - "href": "http://openstack.example.com/v2/openstack/servers/63a8aa13-60fe-41c4-b079-77f6fdf3c841", - "rel": "self" - }, - { - "href": "http://openstack.example.com/openstack/servers/63a8aa13-60fe-41c4-b079-77f6fdf3c841", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "openstack", - "updated": "2012-12-02T02:11:56Z", - "user_id": "fake" - } -} \ No newline at end of file diff --git a/doc/api_samples/OS-DCF/server-get-resp.json b/doc/api_samples/OS-DCF/server-get-resp.json deleted file mode 100644 index 4ad77036f5..0000000000 --- a/doc/api_samples/OS-DCF/server-get-resp.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "server": { - "OS-DCF:diskConfig": "AUTO", - "accessIPv4": "", - "accessIPv6": "", - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "version": 4 - } - ] - }, - "created": "2012-12-02T02:11:55Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/openstack/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "c949ab4256cea23b6089b710aa2df48bf6577ed915278b62e33ad8bb", - "id": "5046e2f2-3b33-4041-b3cf-e085f73e78e7", - "image": { - "id": "70a599e0-31e7-49b7-b260-868f441e862b", - "links": [ - { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "bookmark" - } - ] - }, - "links": [ - { - "href": "http://openstack.example.com/v2/openstack/servers/5046e2f2-3b33-4041-b3cf-e085f73e78e7", - "rel": "self" - }, - { - "href": "http://openstack.example.com/openstack/servers/5046e2f2-3b33-4041-b3cf-e085f73e78e7", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "openstack", - "updated": "2012-12-02T02:11:55Z", - "user_id": "fake" - } -} \ No newline at end of file diff --git a/doc/api_samples/OS-DCF/server-post-req.json b/doc/api_samples/OS-DCF/server-post-req.json deleted file mode 100644 index d88eb41222..0000000000 --- a/doc/api_samples/OS-DCF/server-post-req.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "server" : { - "name" : "new-server-test", - "imageRef" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", - "flavorRef" : "http://openstack.example.com/openstack/flavors/1", - "metadata" : { - "My Server Name" : "Apache1" - }, - "personality" : [ - { - "path" : "/etc/banner.txt", - "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA==" - } - ] - } -} \ No newline at end of file diff --git a/doc/api_samples/OS-DCF/server-post-resp.json b/doc/api_samples/OS-DCF/server-post-resp.json deleted file mode 100644 index f5c1a70f1c..0000000000 --- a/doc/api_samples/OS-DCF/server-post-resp.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "server": { - "OS-DCF:diskConfig": "AUTO", - "adminPass": "CQH9gWzgkVno", - "id": "324dfb7d-f4a9-419a-9a19-237df04b443b", - "links": [ - { - "href": "http://openstack.example.com/v2/openstack/servers/324dfb7d-f4a9-419a-9a19-237df04b443b", - "rel": "self" - }, - { - "href": "http://openstack.example.com/openstack/servers/324dfb7d-f4a9-419a-9a19-237df04b443b", - "rel": "bookmark" - } - ] - } -} \ No newline at end of file diff --git a/doc/api_samples/OS-DCF/server-resize-post-req.json b/doc/api_samples/OS-DCF/server-resize-post-req.json deleted file mode 100644 index 55e11a31ed..0000000000 --- a/doc/api_samples/OS-DCF/server-resize-post-req.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "resize": { - "flavorRef": "3", - "OS-DCF:diskConfig": "AUTO" - } -} \ No newline at end of file diff --git a/doc/api_samples/OS-DCF/server-update-put-req.json b/doc/api_samples/OS-DCF/server-update-put-req.json deleted file mode 100644 index 898ab886ad..0000000000 --- a/doc/api_samples/OS-DCF/server-update-put-req.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "server": { - "OS-DCF:diskConfig": "AUTO" - } -} \ No newline at end of file diff --git a/doc/api_samples/OS-DCF/server-update-put-resp.json b/doc/api_samples/OS-DCF/server-update-put-resp.json deleted file mode 100644 index ce6e08455a..0000000000 --- a/doc/api_samples/OS-DCF/server-update-put-resp.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "server": { - "OS-DCF:diskConfig": "AUTO", - "accessIPv4": "", - "accessIPv6": "", - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "version": 4 - } - ] - }, - "created": "2012-12-02T02:11:57Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/openstack/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "6e84af987b4e7ec1c039b16d21f508f4a505672bd94fb0218b668d07", - "id": "324dfb7d-f4a9-419a-9a19-237df04b443b", - "image": { - "id": "70a599e0-31e7-49b7-b260-868f441e862b", - "links": [ - { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "bookmark" - } - ] - }, - "links": [ - { - "href": "http://openstack.example.com/v2/openstack/servers/324dfb7d-f4a9-419a-9a19-237df04b443b", - "rel": "self" - }, - { - "href": "http://openstack.example.com/openstack/servers/324dfb7d-f4a9-419a-9a19-237df04b443b", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "openstack", - "updated": "2012-12-02T02:11:58Z", - "user_id": "fake" - } -} \ No newline at end of file diff --git a/doc/v3/api_samples/os-disk-config/image-get-resp.json b/doc/v3/api_samples/os-disk-config/image-get-resp.json index 6947e395ab..9105de415f 100644 --- a/doc/v3/api_samples/os-disk-config/image-get-resp.json +++ b/doc/v3/api_samples/os-disk-config/image-get-resp.json @@ -5,11 +5,11 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/v3/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "self" }, { - "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" }, { diff --git a/doc/v3/api_samples/os-disk-config/image-list-resp.json b/doc/v3/api_samples/os-disk-config/image-list-resp.json index 0e3ae990a0..d3fa4d567e 100644 --- a/doc/v3/api_samples/os-disk-config/image-list-resp.json +++ b/doc/v3/api_samples/os-disk-config/image-list-resp.json @@ -6,11 +6,11 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/v3/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "self" }, { - "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" }, { @@ -37,11 +37,11 @@ "id": "155d900f-4e14-4e4c-a73d-069cbf4541e6", "links": [ { - "href": "http://openstack.example.com/v3/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "href": "http://openstack.example.com/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", "rel": "self" }, { - "href": "http://openstack.example.com/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "href": "http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", "rel": "bookmark" }, { @@ -67,11 +67,11 @@ "id": "a2459075-d96c-40d5-893e-577ff92e721c", "links": [ { - "href": "http://openstack.example.com/v3/images/a2459075-d96c-40d5-893e-577ff92e721c", + "href": "http://openstack.example.com/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", "rel": "self" }, { - "href": "http://openstack.example.com/images/a2459075-d96c-40d5-893e-577ff92e721c", + "href": "http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", "rel": "bookmark" }, { @@ -97,11 +97,11 @@ "id": "a440c04b-79fa-479c-bed1-0b816eaec379", "links": [ { - "href": "http://openstack.example.com/v3/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "href": "http://openstack.example.com/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", "rel": "self" }, { - "href": "http://openstack.example.com/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "href": "http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", "rel": "bookmark" }, { @@ -128,11 +128,11 @@ "id": "c905cedb-7281-47e4-8a62-f26bc5fc4c77", "links": [ { - "href": "http://openstack.example.com/v3/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "href": "http://openstack.example.com/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", "rel": "self" }, { - "href": "http://openstack.example.com/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "href": "http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", "rel": "bookmark" }, { @@ -157,11 +157,11 @@ "id": "cedef40a-ed67-4d10-800e-17455edce175", "links": [ { - "href": "http://openstack.example.com/v3/images/cedef40a-ed67-4d10-800e-17455edce175", + "href": "http://openstack.example.com/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", "rel": "self" }, { - "href": "http://openstack.example.com/images/cedef40a-ed67-4d10-800e-17455edce175", + "href": "http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", "rel": "bookmark" }, { @@ -186,11 +186,11 @@ "id": "76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", "links": [ { - "href": "http://openstack.example.com/v3/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "href": "http://openstack.example.com/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", "rel": "self" }, { - "href": "http://openstack.example.com/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "href": "http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", "rel": "bookmark" }, { diff --git a/doc/v3/api_samples/os-disk-config/list-servers-detail-get.json b/doc/v3/api_samples/os-disk-config/list-servers-detail-get.json index 2ba696005c..8ebcf9462a 100644 --- a/doc/v3/api_samples/os-disk-config/list-servers-detail-get.json +++ b/doc/v3/api_samples/os-disk-config/list-servers-detail-get.json @@ -2,6 +2,8 @@ "servers": [ { "OS-DCF:diskConfig": "AUTO", + "accessIPv4": "", + "accessIPv6": "", "addresses": { "private": [ { @@ -17,7 +19,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/flavors/1", + "href": "http://openstack.example.com/openstack/flavors/1", "rel": "bookmark" } ] @@ -28,18 +30,18 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] }, "links": [ { - "href": "http://openstack.example.com/v3/servers/05372e62-05b9-4ee2-9343-9a1fdf2a5fda", + "href": "http://openstack.example.com/v2/openstack/servers/05372e62-05b9-4ee2-9343-9a1fdf2a5fda", "rel": "self" }, { - "href": "http://openstack.example.com/servers/05372e62-05b9-4ee2-9343-9a1fdf2a5fda", + "href": "http://openstack.example.com/openstack/servers/05372e62-05b9-4ee2-9343-9a1fdf2a5fda", "rel": "bookmark" } ], diff --git a/doc/v3/api_samples/os-disk-config/server-action-rebuild-req.json b/doc/v3/api_samples/os-disk-config/server-action-rebuild-req.json index b500875c7a..514607f6d2 100644 --- a/doc/v3/api_samples/os-disk-config/server-action-rebuild-req.json +++ b/doc/v3/api_samples/os-disk-config/server-action-rebuild-req.json @@ -1,6 +1,6 @@ { "rebuild": { - "imageRef" : "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", + "imageRef" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", "OS-DCF:diskConfig": "AUTO" } } \ No newline at end of file diff --git a/doc/v3/api_samples/os-disk-config/server-action-rebuild-resp.json b/doc/v3/api_samples/os-disk-config/server-action-rebuild-resp.json index 67032b2d67..24e1e5d042 100644 --- a/doc/v3/api_samples/os-disk-config/server-action-rebuild-resp.json +++ b/doc/v3/api_samples/os-disk-config/server-action-rebuild-resp.json @@ -1,6 +1,8 @@ { "server": { "OS-DCF:diskConfig": "AUTO", + "accessIPv4": "", + "accessIPv6": "", "addresses": { "private": [ { @@ -15,7 +17,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/flavors/1", + "href": "http://openstack.example.com/openstack/flavors/1", "rel": "bookmark" } ] @@ -26,18 +28,18 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] }, "links": [ { - "href": "http://openstack.example.com/v3/servers/63a8aa13-60fe-41c4-b079-77f6fdf3c841", + "href": "http://openstack.example.com/v2/openstack/servers/63a8aa13-60fe-41c4-b079-77f6fdf3c841", "rel": "self" }, { - "href": "http://openstack.example.com/servers/63a8aa13-60fe-41c4-b079-77f6fdf3c841", + "href": "http://openstack.example.com/openstack/servers/63a8aa13-60fe-41c4-b079-77f6fdf3c841", "rel": "bookmark" } ], diff --git a/doc/v3/api_samples/os-disk-config/server-get-resp.json b/doc/v3/api_samples/os-disk-config/server-get-resp.json index b7103cd576..3bddcd4054 100644 --- a/doc/v3/api_samples/os-disk-config/server-get-resp.json +++ b/doc/v3/api_samples/os-disk-config/server-get-resp.json @@ -1,6 +1,8 @@ { "server": { "OS-DCF:diskConfig": "AUTO", + "accessIPv4": "", + "accessIPv6": "", "addresses": { "private": [ { @@ -16,7 +18,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/flavors/1", + "href": "http://openstack.example.com/openstack/flavors/1", "rel": "bookmark" } ] @@ -27,18 +29,18 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] }, "links": [ { - "href": "http://openstack.example.com/v3/servers/5046e2f2-3b33-4041-b3cf-e085f73e78e7", + "href": "http://openstack.example.com/v2/openstack/servers/5046e2f2-3b33-4041-b3cf-e085f73e78e7", "rel": "self" }, { - "href": "http://openstack.example.com/servers/5046e2f2-3b33-4041-b3cf-e085f73e78e7", + "href": "http://openstack.example.com/openstack/servers/5046e2f2-3b33-4041-b3cf-e085f73e78e7", "rel": "bookmark" } ], diff --git a/doc/v3/api_samples/os-disk-config/server-post-req.json b/doc/v3/api_samples/os-disk-config/server-post-req.json index 3651d7265e..b754fc0714 100644 --- a/doc/v3/api_samples/os-disk-config/server-post-req.json +++ b/doc/v3/api_samples/os-disk-config/server-post-req.json @@ -1,8 +1,8 @@ { "server" : { "name" : "new-server-test", - "imageRef" : "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", - "flavorRef" : "http://openstack.example.com/flavors/1", + "imageRef" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "flavorRef" : "http://openstack.example.com/openstack/flavors/1", "metadata" : { "My Server Name" : "Apache1" } diff --git a/doc/v3/api_samples/os-disk-config/server-post-resp.json b/doc/v3/api_samples/os-disk-config/server-post-resp.json index 725dc09ded..f5c1a70f1c 100644 --- a/doc/v3/api_samples/os-disk-config/server-post-resp.json +++ b/doc/v3/api_samples/os-disk-config/server-post-resp.json @@ -5,11 +5,11 @@ "id": "324dfb7d-f4a9-419a-9a19-237df04b443b", "links": [ { - "href": "http://openstack.example.com/v3/servers/324dfb7d-f4a9-419a-9a19-237df04b443b", + "href": "http://openstack.example.com/v2/openstack/servers/324dfb7d-f4a9-419a-9a19-237df04b443b", "rel": "self" }, { - "href": "http://openstack.example.com/servers/324dfb7d-f4a9-419a-9a19-237df04b443b", + "href": "http://openstack.example.com/openstack/servers/324dfb7d-f4a9-419a-9a19-237df04b443b", "rel": "bookmark" } ] diff --git a/doc/v3/api_samples/os-disk-config/server-update-put-resp.json b/doc/v3/api_samples/os-disk-config/server-update-put-resp.json index 1706b980d8..ce6e08455a 100644 --- a/doc/v3/api_samples/os-disk-config/server-update-put-resp.json +++ b/doc/v3/api_samples/os-disk-config/server-update-put-resp.json @@ -1,6 +1,8 @@ { "server": { "OS-DCF:diskConfig": "AUTO", + "accessIPv4": "", + "accessIPv6": "", "addresses": { "private": [ { @@ -14,7 +16,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/flavors/1", + "href": "http://openstack.example.com/openstack/flavors/1", "rel": "bookmark" } ] @@ -25,18 +27,18 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] }, "links": [ { - "href": "http://openstack.example.com/v3/servers/324dfb7d-f4a9-419a-9a19-237df04b443b", + "href": "http://openstack.example.com/v2/openstack/servers/324dfb7d-f4a9-419a-9a19-237df04b443b", "rel": "self" }, { - "href": "http://openstack.example.com/servers/324dfb7d-f4a9-419a-9a19-237df04b443b", + "href": "http://openstack.example.com/openstack/servers/324dfb7d-f4a9-419a-9a19-237df04b443b", "rel": "bookmark" } ], diff --git a/nova/tests/functional/api_samples/OS-DCF/image-get-resp.json.tpl b/nova/tests/functional/api_samples/OS-DCF/image-get-resp.json.tpl deleted file mode 100644 index 72ff4448b8..0000000000 --- a/nova/tests/functional/api_samples/OS-DCF/image-get-resp.json.tpl +++ /dev/null @@ -1,34 +0,0 @@ -{ - "image": { - "OS-DCF:diskConfig": "AUTO", - "created": "2011-01-01T01:02:03Z", - "id": "%(image_id)s", - "links": [ - { - "href": "%(host)s/v2/openstack/images/%(image_id)s", - "rel": "self" - }, - { - "href": "%(host)s/openstack/images/%(image_id)s", - "rel": "bookmark" - }, - { - "href": "%(glance_host)s/images/%(image_id)s", - "rel": "alternate", - "type": "application/vnd.openstack.image" - } - ], - "metadata": { - "architecture": "x86_64", - "auto_disk_config": "True", - "kernel_id": "nokernel", - "ramdisk_id": "nokernel" - }, - "minDisk": 0, - "minRam": 0, - "name": "fakeimage7", - "progress": 100, - "status": "ACTIVE", - "updated": "2011-01-01T01:02:03Z" - } -} diff --git a/nova/tests/functional/api_samples/OS-DCF/image-list-resp.json.tpl b/nova/tests/functional/api_samples/OS-DCF/image-list-resp.json.tpl deleted file mode 100644 index 62f02287f8..0000000000 --- a/nova/tests/functional/api_samples/OS-DCF/image-list-resp.json.tpl +++ /dev/null @@ -1,214 +0,0 @@ -{ - "images": [ - { - "OS-DCF:diskConfig": "AUTO", - "created": "2011-01-01T01:02:03Z", - "id": "%(id)s", - "links": [ - { - "href": "%(host)s/v2/openstack/images/%(id)s", - "rel": "self" - }, - { - "href": "%(host)s/openstack/images/%(id)s", - "rel": "bookmark" - }, - { - "href": "%(glance_host)s/images/%(id)s", - "rel": "alternate", - "type": "application/vnd.openstack.image" - } - ], - "metadata": { - "architecture": "x86_64", - "auto_disk_config": "True", - "kernel_id": "nokernel", - "ramdisk_id": "nokernel" - }, - "minDisk": 0, - "minRam": 0, - "name": "fakeimage7", - "progress": 100, - "status": "ACTIVE", - "updated": "2011-01-01T01:02:03Z" - }, - { - "created": "2011-01-01T01:02:03Z", - "id": "%(id)s", - "links": [ - { - "href": "%(host)s/v2/openstack/images/%(id)s", - "rel": "self" - }, - { - "href": "%(host)s/openstack/images/%(id)s", - "rel": "bookmark" - }, - { - "href": "%(glance_host)s/images/%(id)s", - "rel": "alternate", - "type": "application/vnd.openstack.image" - } - ], - "metadata": { - "architecture": "x86_64", - "kernel_id": "nokernel", - "ramdisk_id": "nokernel" - }, - "minDisk": 0, - "minRam": 0, - "name": "fakeimage123456", - "progress": 100, - "status": "ACTIVE", - "updated": "2011-01-01T01:02:03Z" - }, - { - "created": "2011-01-01T01:02:03Z", - "id": "%(uuid)s", - "links": [ - { - "href": "%(host)s/v2/openstack/images/%(uuid)s", - "rel": "self" - }, - { - "href": "%(host)s/openstack/images/%(uuid)s", - "rel": "bookmark" - }, - { - "href": "%(glance_host)s/images/%(uuid)s", - "rel": "alternate", - "type": "application/vnd.openstack.image" - } - ], - "metadata": { - "kernel_id": "nokernel", - "ramdisk_id": "nokernel" - }, - "minDisk": 0, - "minRam": 0, - "name": "fakeimage123456", - "progress": 100, - "status": "ACTIVE", - "updated": "2011-01-01T01:02:03Z" - }, - { - "OS-DCF:diskConfig": "MANUAL", - "created": "2011-01-01T01:02:03Z", - "id": "%(uuid)s", - "links": [ - { - "href": "%(host)s/v2/openstack/images/%(uuid)s", - "rel": "self" - }, - { - "href": "%(host)s/openstack/images/%(uuid)s", - "rel": "bookmark" - }, - { - "href": "%(glance_host)s/images/%(uuid)s", - "rel": "alternate", - "type": "application/vnd.openstack.image" - } - ], - "metadata": { - "architecture": "x86_64", - "auto_disk_config": "False", - "kernel_id": "nokernel", - "ramdisk_id": "nokernel" - }, - "minDisk": 0, - "minRam": 0, - "name": "fakeimage6", - "progress": 100, - "status": "ACTIVE", - "updated": "2011-01-01T01:02:03Z" - }, - { - "created": "2011-01-01T01:02:03Z", - "id": "%(id)s", - "links": [ - { - "href": "%(host)s/v2/openstack/images/%(id)s", - "rel": "self" - }, - { - "href": "%(host)s/openstack/images/%(id)s", - "rel": "bookmark" - }, - { - "href": "%(glance_host)s/images/%(id)s", - "rel": "alternate", - "type": "application/vnd.openstack.image" - } - ], - "metadata": { - "kernel_id": "%(id)s", - "ramdisk_id": null - }, - "minDisk": 0, - "minRam": 0, - "name": "fakeimage123456", - "progress": 100, - "status": "ACTIVE", - "updated": "2011-01-01T01:02:03Z" - }, - { - "created": "2011-01-01T01:02:03Z", - "id": "%(id)s", - "links": [ - { - "href": "%(host)s/v2/openstack/images/%(id)s", - "rel": "self" - }, - { - "href": "%(host)s/openstack/images/%(id)s", - "rel": "bookmark" - }, - { - "href": "%(glance_host)s/images/%(id)s", - "rel": "alternate", - "type": "application/vnd.openstack.image" - } - ], - "metadata": { - "kernel_id": "nokernel", - "ramdisk_id": "nokernel" - }, - "minDisk": 0, - "minRam": 0, - "name": "fakeimage123456", - "progress": 100, - "status": "ACTIVE", - "updated": "2011-01-01T01:02:03Z" - }, - { - "created": "2011-01-01T01:02:03Z", - "id": "%(id)s", - "links": [ - { - "href": "%(host)s/v2/openstack/images/%(id)s", - "rel": "self" - }, - { - "href": "%(host)s/openstack/images/%(id)s", - "rel": "bookmark" - }, - { - "href": "%(glance_host)s/images/%(id)s", - "rel": "alternate", - "type": "application/vnd.openstack.image" - } - ], - "metadata": { - "kernel_id": "nokernel", - "ramdisk_id": "nokernel" - }, - "minDisk": 0, - "minRam": 0, - "name": "fakeimage123456", - "progress": 100, - "status": "ACTIVE", - "updated": "2011-01-01T01:02:03Z" - } - ] -} diff --git a/nova/tests/functional/api_samples/OS-DCF/list-servers-detail-get.json.tpl b/nova/tests/functional/api_samples/OS-DCF/list-servers-detail-get.json.tpl deleted file mode 100644 index 37c8e57dba..0000000000 --- a/nova/tests/functional/api_samples/OS-DCF/list-servers-detail-get.json.tpl +++ /dev/null @@ -1,57 +0,0 @@ -{ - "servers": [ - { - "OS-DCF:diskConfig": "AUTO", - "accessIPv4": "", - "accessIPv6": "", - "addresses": { - "private": [ - { - "addr": "%(ip)s", - "version": 4 - } - ] - }, - "created": "%(isotime)s", - "flavor": { - "id": "1", - "links": [ - { - "href": "%(host)s/openstack/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "%(hostid)s", - "id": "%(id)s", - "image": { - "id": "%(uuid)s", - "links": [ - { - "href": "%(host)s/openstack/images/%(uuid)s", - "rel": "bookmark" - } - ] - }, - "links": [ - { - "href": "%(host)s/v2/openstack/servers/%(id)s", - "rel": "self" - }, - { - "href": "%(host)s/openstack/servers/%(id)s", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "openstack", - "updated": "%(isotime)s", - "user_id": "fake" - } - ] -} diff --git a/nova/tests/functional/api_samples/OS-DCF/server-action-rebuild-req.json.tpl b/nova/tests/functional/api_samples/OS-DCF/server-action-rebuild-req.json.tpl deleted file mode 100644 index b239818a8a..0000000000 --- a/nova/tests/functional/api_samples/OS-DCF/server-action-rebuild-req.json.tpl +++ /dev/null @@ -1,6 +0,0 @@ -{ - "rebuild": { - "imageRef" : "%(host)s/openstack/images/%(image_id)s", - "OS-DCF:diskConfig": "AUTO" - } -} diff --git a/nova/tests/functional/api_samples/OS-DCF/server-action-rebuild-resp.json.tpl b/nova/tests/functional/api_samples/OS-DCF/server-action-rebuild-resp.json.tpl deleted file mode 100644 index 9b9f188023..0000000000 --- a/nova/tests/functional/api_samples/OS-DCF/server-action-rebuild-resp.json.tpl +++ /dev/null @@ -1,56 +0,0 @@ -{ - "server": { - "OS-DCF:diskConfig": "AUTO", - "accessIPv4": "", - "accessIPv6": "", - "addresses": { - "private": [ - { - "addr": "%(ip)s", - "version": 4 - } - ] - }, - "adminPass": "%(password)s", - "created": "%(isotime)s", - "flavor": { - "id": "1", - "links": [ - { - "href": "%(host)s/openstack/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "%(hostid)s", - "id": "%(id)s", - "image": { - "id": "%(uuid)s", - "links": [ - { - "href": "%(host)s/openstack/images/%(uuid)s", - "rel": "bookmark" - } - ] - }, - "links": [ - { - "href": "%(host)s/v2/openstack/servers/%(id)s", - "rel": "self" - }, - { - "href": "%(host)s/openstack/servers/%(id)s", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "openstack", - "updated": "%(isotime)s", - "user_id": "fake" - } -} diff --git a/nova/tests/functional/api_samples/OS-DCF/server-get-resp.json.tpl b/nova/tests/functional/api_samples/OS-DCF/server-get-resp.json.tpl deleted file mode 100644 index d9cc795728..0000000000 --- a/nova/tests/functional/api_samples/OS-DCF/server-get-resp.json.tpl +++ /dev/null @@ -1,55 +0,0 @@ -{ - "server": { - "OS-DCF:diskConfig": "AUTO", - "accessIPv4": "", - "accessIPv6": "", - "addresses": { - "private": [ - { - "addr": "%(ip)s", - "version": 4 - } - ] - }, - "created": "%(isotime)s", - "flavor": { - "id": "1", - "links": [ - { - "href": "%(host)s/openstack/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "%(hostid)s", - "id": "%(id)s", - "image": { - "id": "%(uuid)s", - "links": [ - { - "href": "%(host)s/openstack/images/%(uuid)s", - "rel": "bookmark" - } - ] - }, - "links": [ - { - "href": "%(host)s/v2/openstack/servers/%(id)s", - "rel": "self" - }, - { - "href": "%(host)s/openstack/servers/%(id)s", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "openstack", - "updated": "%(isotime)s", - "user_id": "fake" - } -} diff --git a/nova/tests/functional/api_samples/OS-DCF/server-post-req.json.tpl b/nova/tests/functional/api_samples/OS-DCF/server-post-req.json.tpl deleted file mode 100644 index 81b89adf23..0000000000 --- a/nova/tests/functional/api_samples/OS-DCF/server-post-req.json.tpl +++ /dev/null @@ -1,17 +0,0 @@ -{ - "server" : { - "OS-DCF:diskConfig": "AUTO", - "name" : "new-server-test", - "imageRef" : "%(host)s/openstack/images/%(image_id)s", - "flavorRef" : "%(host)s/openstack/flavors/1", - "metadata" : { - "My Server Name" : "Apache1" - }, - "personality" : [ - { - "path" : "/etc/banner.txt", - "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA==" - } - ] - } -} diff --git a/nova/tests/functional/api_samples/OS-DCF/server-post-resp.json.tpl b/nova/tests/functional/api_samples/OS-DCF/server-post-resp.json.tpl deleted file mode 100644 index 7c8371f161..0000000000 --- a/nova/tests/functional/api_samples/OS-DCF/server-post-resp.json.tpl +++ /dev/null @@ -1,17 +0,0 @@ -{ - "server": { - "OS-DCF:diskConfig": "AUTO", - "adminPass": "%(password)s", - "id": "%(id)s", - "links": [ - { - "href": "%(host)s/v2/openstack/servers/%(uuid)s", - "rel": "self" - }, - { - "href": "%(host)s/openstack/servers/%(uuid)s", - "rel": "bookmark" - } - ] - } -} diff --git a/nova/tests/functional/api_samples/OS-DCF/server-resize-post-req.json.tpl b/nova/tests/functional/api_samples/OS-DCF/server-resize-post-req.json.tpl deleted file mode 100644 index a290485e1c..0000000000 --- a/nova/tests/functional/api_samples/OS-DCF/server-resize-post-req.json.tpl +++ /dev/null @@ -1,6 +0,0 @@ -{ - "resize": { - "flavorRef": "3", - "OS-DCF:diskConfig": "AUTO" - } -} diff --git a/nova/tests/functional/api_samples/OS-DCF/server-update-put-req.json.tpl b/nova/tests/functional/api_samples/OS-DCF/server-update-put-req.json.tpl deleted file mode 100644 index 4ac22820df..0000000000 --- a/nova/tests/functional/api_samples/OS-DCF/server-update-put-req.json.tpl +++ /dev/null @@ -1,5 +0,0 @@ -{ - "server": { - "OS-DCF:diskConfig": "AUTO" - } -} diff --git a/nova/tests/functional/api_samples/OS-DCF/server-update-put-resp.json.tpl b/nova/tests/functional/api_samples/OS-DCF/server-update-put-resp.json.tpl deleted file mode 100644 index d9cc795728..0000000000 --- a/nova/tests/functional/api_samples/OS-DCF/server-update-put-resp.json.tpl +++ /dev/null @@ -1,55 +0,0 @@ -{ - "server": { - "OS-DCF:diskConfig": "AUTO", - "accessIPv4": "", - "accessIPv6": "", - "addresses": { - "private": [ - { - "addr": "%(ip)s", - "version": 4 - } - ] - }, - "created": "%(isotime)s", - "flavor": { - "id": "1", - "links": [ - { - "href": "%(host)s/openstack/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "%(hostid)s", - "id": "%(id)s", - "image": { - "id": "%(uuid)s", - "links": [ - { - "href": "%(host)s/openstack/images/%(uuid)s", - "rel": "bookmark" - } - ] - }, - "links": [ - { - "href": "%(host)s/v2/openstack/servers/%(id)s", - "rel": "self" - }, - { - "href": "%(host)s/openstack/servers/%(id)s", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "openstack", - "updated": "%(isotime)s", - "user_id": "fake" - } -} diff --git a/nova/tests/functional/test_api_samples.py b/nova/tests/functional/test_api_samples.py index f714c50b66..ce309fb5ff 100644 --- a/nova/tests/functional/test_api_samples.py +++ b/nova/tests/functional/test_api_samples.py @@ -590,69 +590,6 @@ class ServerPasswordSampleJsonTests(ServersSampleBase): self.assertEqual(response.status_code, 204) -class DiskConfigJsonTest(ServersSampleBase): - extension_name = ("nova.api.openstack.compute.contrib.disk_config." - "Disk_config") - - def test_list_servers_detail(self): - uuid = self._post_server(use_common_server_api_samples=False) - response = self._do_get('servers/detail') - subs = self._get_regexes() - subs['hostid'] = '[a-f0-9]+' - subs['id'] = uuid - self._verify_response('list-servers-detail-get', subs, response, 200) - - def test_get_server(self): - uuid = self._post_server(use_common_server_api_samples=False) - response = self._do_get('servers/%s' % uuid) - subs = self._get_regexes() - subs['hostid'] = '[a-f0-9]+' - self._verify_response('server-get-resp', subs, response, 200) - - def test_update_server(self): - uuid = self._post_server(use_common_server_api_samples=False) - response = self._do_put('servers/%s' % uuid, - 'server-update-put-req', {}) - subs = self._get_regexes() - subs['hostid'] = '[a-f0-9]+' - self._verify_response('server-update-put-resp', subs, response, 200) - - def test_resize_server(self): - self.flags(allow_resize_to_same_host=True) - uuid = self._post_server(use_common_server_api_samples=False) - response = self._do_post('servers/%s/action' % uuid, - 'server-resize-post-req', {}) - self.assertEqual(response.status_code, 202) - # NOTE(tmello): Resize does not return response body - # Bug #1085213. - self.assertEqual(response.content, "") - - def test_rebuild_server(self): - uuid = self._post_server(use_common_server_api_samples=False) - subs = { - 'image_id': fake.get_valid_image_id(), - 'host': self._get_host(), - } - response = self._do_post('servers/%s/action' % uuid, - 'server-action-rebuild-req', subs) - subs = self._get_regexes() - subs['hostid'] = '[a-f0-9]+' - self._verify_response('server-action-rebuild-resp', - subs, response, 202) - - def test_get_image(self): - image_id = fake.get_valid_image_id() - response = self._do_get('images/%s' % image_id) - subs = self._get_regexes() - subs['image_id'] = image_id - self._verify_response('image-get-resp', subs, response, 200) - - def test_list_images(self): - response = self._do_get('images/detail') - subs = self._get_regexes() - self._verify_response('image-list-resp', subs, response, 200) - - class BlockDeviceMappingV2BootJsonTest(ServersSampleBase): extension_name = ('nova.api.openstack.compute.contrib.' 'block_device_mapping_v2_boot.' diff --git a/nova/tests/functional/v3/api_samples/os-disk-config/image-get-resp.json.tpl b/nova/tests/functional/v3/api_samples/os-disk-config/image-get-resp.json.tpl index b79c7c857e..72ff4448b8 100644 --- a/nova/tests/functional/v3/api_samples/os-disk-config/image-get-resp.json.tpl +++ b/nova/tests/functional/v3/api_samples/os-disk-config/image-get-resp.json.tpl @@ -5,11 +5,11 @@ "id": "%(image_id)s", "links": [ { - "href": "%(host)s/v3/images/%(image_id)s", + "href": "%(host)s/v2/openstack/images/%(image_id)s", "rel": "self" }, { - "href": "%(host)s/images/%(image_id)s", + "href": "%(host)s/openstack/images/%(image_id)s", "rel": "bookmark" }, { diff --git a/nova/tests/functional/v3/api_samples/os-disk-config/image-list-resp.json.tpl b/nova/tests/functional/v3/api_samples/os-disk-config/image-list-resp.json.tpl index f74aeb7c85..62f02287f8 100644 --- a/nova/tests/functional/v3/api_samples/os-disk-config/image-list-resp.json.tpl +++ b/nova/tests/functional/v3/api_samples/os-disk-config/image-list-resp.json.tpl @@ -6,11 +6,11 @@ "id": "%(id)s", "links": [ { - "href": "%(host)s/v3/images/%(id)s", + "href": "%(host)s/v2/openstack/images/%(id)s", "rel": "self" }, { - "href": "%(host)s/images/%(id)s", + "href": "%(host)s/openstack/images/%(id)s", "rel": "bookmark" }, { @@ -37,11 +37,11 @@ "id": "%(id)s", "links": [ { - "href": "%(host)s/v3/images/%(id)s", + "href": "%(host)s/v2/openstack/images/%(id)s", "rel": "self" }, { - "href": "%(host)s/images/%(id)s", + "href": "%(host)s/openstack/images/%(id)s", "rel": "bookmark" }, { @@ -67,11 +67,11 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/v3/images/%(uuid)s", + "href": "%(host)s/v2/openstack/images/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/images/%(uuid)s", + "href": "%(host)s/openstack/images/%(uuid)s", "rel": "bookmark" }, { @@ -97,11 +97,11 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/v3/images/%(uuid)s", + "href": "%(host)s/v2/openstack/images/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/images/%(uuid)s", + "href": "%(host)s/openstack/images/%(uuid)s", "rel": "bookmark" }, { @@ -128,11 +128,11 @@ "id": "%(id)s", "links": [ { - "href": "%(host)s/v3/images/%(id)s", + "href": "%(host)s/v2/openstack/images/%(id)s", "rel": "self" }, { - "href": "%(host)s/images/%(id)s", + "href": "%(host)s/openstack/images/%(id)s", "rel": "bookmark" }, { @@ -157,11 +157,11 @@ "id": "%(id)s", "links": [ { - "href": "%(host)s/v3/images/%(id)s", + "href": "%(host)s/v2/openstack/images/%(id)s", "rel": "self" }, { - "href": "%(host)s/images/%(id)s", + "href": "%(host)s/openstack/images/%(id)s", "rel": "bookmark" }, { @@ -186,11 +186,11 @@ "id": "%(id)s", "links": [ { - "href": "%(host)s/v3/images/%(id)s", + "href": "%(host)s/v2/openstack/images/%(id)s", "rel": "self" }, { - "href": "%(host)s/images/%(id)s", + "href": "%(host)s/openstack/images/%(id)s", "rel": "bookmark" }, { diff --git a/nova/tests/functional/v3/api_samples/os-disk-config/list-servers-detail-get.json.tpl b/nova/tests/functional/v3/api_samples/os-disk-config/list-servers-detail-get.json.tpl index 8a08b3e011..3ee1b79cbe 100644 --- a/nova/tests/functional/v3/api_samples/os-disk-config/list-servers-detail-get.json.tpl +++ b/nova/tests/functional/v3/api_samples/os-disk-config/list-servers-detail-get.json.tpl @@ -2,6 +2,8 @@ "servers": [ { "OS-DCF:diskConfig": "AUTO", + "accessIPv4": "", + "accessIPv6": "", "addresses": { "private": [ { @@ -17,7 +19,7 @@ "id": "1", "links": [ { - "href": "%(host)s/flavors/1", + "href": "%(host)s/openstack/flavors/1", "rel": "bookmark" } ] @@ -28,18 +30,18 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/images/%(uuid)s", + "href": "%(host)s/openstack/images/%(uuid)s", "rel": "bookmark" } ] }, "links": [ { - "href": "%(host)s/v3/servers/%(id)s", + "href": "%(host)s/v2/openstack/servers/%(id)s", "rel": "self" }, { - "href": "%(host)s/servers/%(id)s", + "href": "%(host)s/openstack/servers/%(id)s", "rel": "bookmark" } ], diff --git a/nova/tests/functional/v3/api_samples/os-disk-config/server-action-rebuild-req.json.tpl b/nova/tests/functional/v3/api_samples/os-disk-config/server-action-rebuild-req.json.tpl index 3d98b99bcb..b239818a8a 100644 --- a/nova/tests/functional/v3/api_samples/os-disk-config/server-action-rebuild-req.json.tpl +++ b/nova/tests/functional/v3/api_samples/os-disk-config/server-action-rebuild-req.json.tpl @@ -1,6 +1,6 @@ { "rebuild": { - "imageRef" : "%(host)s/images/%(image_id)s", + "imageRef" : "%(host)s/openstack/images/%(image_id)s", "OS-DCF:diskConfig": "AUTO" } } diff --git a/nova/tests/functional/v3/api_samples/os-disk-config/server-action-rebuild-resp.json.tpl b/nova/tests/functional/v3/api_samples/os-disk-config/server-action-rebuild-resp.json.tpl index e1bea0978a..f3f6618ea8 100644 --- a/nova/tests/functional/v3/api_samples/os-disk-config/server-action-rebuild-resp.json.tpl +++ b/nova/tests/functional/v3/api_samples/os-disk-config/server-action-rebuild-resp.json.tpl @@ -1,6 +1,8 @@ { "server": { "OS-DCF:diskConfig": "AUTO", + "accessIPv4": "", + "accessIPv6": "", "addresses": { "private": [ { @@ -15,7 +17,7 @@ "id": "1", "links": [ { - "href": "%(host)s/flavors/1", + "href": "%(host)s/openstack/flavors/1", "rel": "bookmark" } ] @@ -26,18 +28,18 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/images/%(uuid)s", + "href": "%(host)s/openstack/images/%(uuid)s", "rel": "bookmark" } ] }, "links": [ { - "href": "%(host)s/v3/servers/%(id)s", + "href": "%(host)s/v2/openstack/servers/%(id)s", "rel": "self" }, { - "href": "%(host)s/servers/%(id)s", + "href": "%(host)s/openstack/servers/%(id)s", "rel": "bookmark" } ], diff --git a/nova/tests/functional/v3/api_samples/os-disk-config/server-get-resp.json.tpl b/nova/tests/functional/v3/api_samples/os-disk-config/server-get-resp.json.tpl index f60c4af52f..290c29c935 100644 --- a/nova/tests/functional/v3/api_samples/os-disk-config/server-get-resp.json.tpl +++ b/nova/tests/functional/v3/api_samples/os-disk-config/server-get-resp.json.tpl @@ -1,6 +1,8 @@ { "server": { "OS-DCF:diskConfig": "AUTO", + "accessIPv4": "", + "accessIPv6": "", "addresses": { "private": [ { @@ -16,7 +18,7 @@ "id": "1", "links": [ { - "href": "%(host)s/flavors/1", + "href": "%(host)s/openstack/flavors/1", "rel": "bookmark" } ] @@ -27,18 +29,18 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/images/%(uuid)s", + "href": "%(host)s/openstack/images/%(uuid)s", "rel": "bookmark" } ] }, "links": [ { - "href": "%(host)s/v3/servers/%(id)s", + "href": "%(host)s/v2/openstack/servers/%(id)s", "rel": "self" }, { - "href": "%(host)s/servers/%(id)s", + "href": "%(host)s/openstack/servers/%(id)s", "rel": "bookmark" } ], diff --git a/nova/tests/functional/v3/api_samples/os-disk-config/server-post-req.json.tpl b/nova/tests/functional/v3/api_samples/os-disk-config/server-post-req.json.tpl index c4652a99f3..8ba378730e 100644 --- a/nova/tests/functional/v3/api_samples/os-disk-config/server-post-req.json.tpl +++ b/nova/tests/functional/v3/api_samples/os-disk-config/server-post-req.json.tpl @@ -2,8 +2,8 @@ "server" : { "OS-DCF:diskConfig": "AUTO", "name" : "new-server-test", - "imageRef" : "%(host)s/images/%(image_id)s", - "flavorRef" : "%(host)s/flavors/1", + "imageRef" : "%(host)s/openstack/images/%(image_id)s", + "flavorRef" : "%(host)s/openstack/flavors/1", "metadata" : { "My Server Name" : "Apache1" } diff --git a/nova/tests/functional/v3/api_samples/os-disk-config/server-post-resp.json.tpl b/nova/tests/functional/v3/api_samples/os-disk-config/server-post-resp.json.tpl index 91aa3432ea..7c8371f161 100644 --- a/nova/tests/functional/v3/api_samples/os-disk-config/server-post-resp.json.tpl +++ b/nova/tests/functional/v3/api_samples/os-disk-config/server-post-resp.json.tpl @@ -5,11 +5,11 @@ "id": "%(id)s", "links": [ { - "href": "%(host)s/v3/servers/%(uuid)s", + "href": "%(host)s/v2/openstack/servers/%(uuid)s", "rel": "self" }, { - "href": "%(host)s/servers/%(uuid)s", + "href": "%(host)s/openstack/servers/%(uuid)s", "rel": "bookmark" } ] diff --git a/nova/tests/functional/v3/api_samples/os-disk-config/server-update-put-resp.json.tpl b/nova/tests/functional/v3/api_samples/os-disk-config/server-update-put-resp.json.tpl index ef6eae3785..96eead83d2 100644 --- a/nova/tests/functional/v3/api_samples/os-disk-config/server-update-put-resp.json.tpl +++ b/nova/tests/functional/v3/api_samples/os-disk-config/server-update-put-resp.json.tpl @@ -1,6 +1,8 @@ { "server": { "OS-DCF:diskConfig": "AUTO", + "accessIPv4": "", + "accessIPv6": "", "addresses": { "private": [ { @@ -14,7 +16,7 @@ "id": "1", "links": [ { - "href": "%(host)s/flavors/1", + "href": "%(host)s/openstack/flavors/1", "rel": "bookmark" } ] @@ -25,18 +27,18 @@ "id": "%(uuid)s", "links": [ { - "href": "%(host)s/images/%(uuid)s", + "href": "%(host)s/openstack/images/%(uuid)s", "rel": "bookmark" } ] }, "links": [ { - "href": "%(host)s/v3/servers/%(id)s", + "href": "%(host)s/v2/openstack/servers/%(id)s", "rel": "self" }, { - "href": "%(host)s/servers/%(id)s", + "href": "%(host)s/openstack/servers/%(id)s", "rel": "bookmark" } ], diff --git a/nova/tests/functional/v3/test_disk_config.py b/nova/tests/functional/v3/test_disk_config.py index 4b817d19ab..a96504ad18 100644 --- a/nova/tests/functional/v3/test_disk_config.py +++ b/nova/tests/functional/v3/test_disk_config.py @@ -13,19 +13,43 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_config import cfg + from nova.tests.functional.v3 import test_servers from nova.tests.unit.image import fake +CONF = cfg.CONF +CONF.import_opt('osapi_compute_extension', + 'nova.api.openstack.compute.extensions') + class DiskConfigJsonTest(test_servers.ServersSampleBase): extension_name = 'os-disk-config' - extra_extensions_to_load = ["images"] + extra_extensions_to_load = ["images", "os-access-ips"] + _api_version = 'v2' + + def _get_flags(self): + f = super(DiskConfigJsonTest, self)._get_flags() + f['osapi_compute_extension'] = CONF.osapi_compute_extension[:] + f['osapi_compute_extension'].append( + 'nova.api.openstack.compute.contrib.keypairs.Keypairs') + f['osapi_compute_extension'].append( + 'nova.api.openstack.compute.contrib.extended_ips.Extended_ips') + f['osapi_compute_extension'].append( + 'nova.api.openstack.compute.contrib.extended_ips_mac.' + 'Extended_ips_mac') + f['osapi_compute_extension'].append( + 'nova.api.openstack.compute.contrib.disk_config.' + 'Disk_config') + return f def test_list_servers_detail(self): uuid = self._post_server(use_common_server_api_samples=False) response = self._do_get('servers/detail') subs = self._get_regexes() subs['hostid'] = '[a-f0-9]+' + subs['access_ip_v4'] = '' + subs['access_ip_v6'] = '' subs['id'] = uuid self._verify_response('list-servers-detail-get', subs, response, 200) @@ -34,6 +58,8 @@ class DiskConfigJsonTest(test_servers.ServersSampleBase): response = self._do_get('servers/%s' % uuid) subs = self._get_regexes() subs['hostid'] = '[a-f0-9]+' + subs['access_ip_v4'] = '' + subs['access_ip_v6'] = '' self._verify_response('server-get-resp', subs, response, 200) def test_update_server(self): @@ -42,6 +68,8 @@ class DiskConfigJsonTest(test_servers.ServersSampleBase): 'server-update-put-req', {}) subs = self._get_regexes() subs['hostid'] = '[a-f0-9]+' + subs['access_ip_v4'] = '' + subs['access_ip_v6'] = '' self._verify_response('server-update-put-resp', subs, response, 200) def test_resize_server(self): @@ -64,6 +92,8 @@ class DiskConfigJsonTest(test_servers.ServersSampleBase): 'server-action-rebuild-req', subs) subs = self._get_regexes() subs['hostid'] = '[a-f0-9]+' + subs['access_ip_v4'] = '' + subs['access_ip_v6'] = '' self._verify_response('server-action-rebuild-resp', subs, response, 202)