diff --git a/doc/api_samples/os-access-ips/server-get-resp.json b/doc/api_samples/os-access-ips/server-get-resp.json deleted file mode 100644 index 130ba4acec..0000000000 --- a/doc/api_samples/os-access-ips/server-get-resp.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "server": { - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", - "OS-EXT-IPS:type": "fixed", - "version": 4 - } - ] - }, - "created": "2013-09-11T03:23:12Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "b3a6fd97c027e18d6d9c7506eea8a236cf2ceca420cfdfe0239a64a8", - "id": "5eedbf0c-c303-4ed3-933a-a4d3732cfa0a", - "image": { - "id": "70a599e0-31e7-49b7-b260-868f441e862b", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "bookmark" - } - ] - }, - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/5eedbf0c-c303-4ed3-933a-a4d3732cfa0a", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/5eedbf0c-c303-4ed3-933a-a4d3732cfa0a", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "accessIPv4": "1.2.3.4", - "accessIPv6": "fe80::", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2013-09-11T03:23:13Z", - "user_id": "fake", - "key_name": null - } -} diff --git a/doc/api_samples/os-access-ips/server-post-req.json b/doc/api_samples/os-access-ips/server-post-req.json deleted file mode 100644 index 8d7489c104..0000000000 --- a/doc/api_samples/os-access-ips/server-post-req.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "server" : { - "accessIPv4": "1.2.3.4", - "accessIPv6": "fe80::", - "name" : "new-server-test", - "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b", - "flavorRef" : "1", - "metadata" : { - "My Server Name" : "Apache1" - } - } -} diff --git a/doc/api_samples/os-access-ips/server-post-resp.json b/doc/api_samples/os-access-ips/server-post-resp.json deleted file mode 100644 index 9c31e93c9a..0000000000 --- a/doc/api_samples/os-access-ips/server-post-resp.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "server": { - "adminPass": "n7JGBda664QG", - "id": "934760e1-2b0b-4f9e-a916-eac1e69839dc", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/934760e1-2b0b-4f9e-a916-eac1e69839dc", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/934760e1-2b0b-4f9e-a916-eac1e69839dc", - "rel": "bookmark" - } - ] - } -} \ No newline at end of file diff --git a/doc/api_samples/os-access-ips/servers-details-resp.json b/doc/api_samples/os-access-ips/servers-details-resp.json deleted file mode 100644 index 844506ea31..0000000000 --- a/doc/api_samples/os-access-ips/servers-details-resp.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "servers": [ - { - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", - "OS-EXT-IPS:type": "fixed", - "version": 4 - } - ] - }, - "created": "2013-09-11T03:23:11Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "9896cb12c9845becf1b9b06c8ff5b131d20300f83e2cdffc92e3f4a4", - "id": "934760e1-2b0b-4f9e-a916-eac1e69839dc", - "image": { - "id": "70a599e0-31e7-49b7-b260-868f441e862b", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "bookmark" - } - ] - }, - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/934760e1-2b0b-4f9e-a916-eac1e69839dc", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/934760e1-2b0b-4f9e-a916-eac1e69839dc", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "accessIPv4": "1.2.3.4", - "accessIPv6": "fe80::", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2013-09-11T03:23:12Z", - "user_id": "fake", - "key_name": null - } - ] -} diff --git a/doc/api_samples/os-config-drive/server-config-drive-get-resp.json b/doc/api_samples/os-config-drive/server-config-drive-get-resp.json deleted file mode 100644 index cd5279aad8..0000000000 --- a/doc/api_samples/os-config-drive/server-config-drive-get-resp.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "server": { - "accessIPv4": "1.2.3.4", - "accessIPv6": "80fe::", - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", - "OS-EXT-IPS:type": "fixed", - "version": 4 - } - ] - }, - "created": "2013-09-22T02:33:23Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "1642bbdbd61a0f1c513b4bb6e418326103172698104bfa278eca106b", - "id": "7838ff1b-b71f-48b9-91e9-7c08de20b249", - "image": { - "id": "70a599e0-31e7-49b7-b260-868f441e862b", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "bookmark" - } - ] - }, - "key_name": null, - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/7838ff1b-b71f-48b9-91e9-7c08de20b249", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/7838ff1b-b71f-48b9-91e9-7c08de20b249", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "config_drive": "", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2013-09-22T02:33:25Z", - "user_id": "fake" - } -} diff --git a/doc/api_samples/os-config-drive/server-post-req.json b/doc/api_samples/os-config-drive/server-post-req.json deleted file mode 100644 index ca53f3a7c2..0000000000 --- a/doc/api_samples/os-config-drive/server-post-req.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "server" : { - "accessIPv4": "1.2.3.4", - "accessIPv6": "80fe::", - "name" : "new-server-test", - "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b", - "flavorRef" : "1", - "metadata" : { - "My Server Name" : "Apache1" - } - } -} diff --git a/doc/api_samples/os-config-drive/server-post-resp.json b/doc/api_samples/os-config-drive/server-post-resp.json deleted file mode 100644 index 971625574e..0000000000 --- a/doc/api_samples/os-config-drive/server-post-resp.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "server": { - "adminPass": "h2cx3Lm47BJc", - "id": "f0318e69-11eb-4aed-9840-59b6c72beee8", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/f0318e69-11eb-4aed-9840-59b6c72beee8", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/f0318e69-11eb-4aed-9840-59b6c72beee8", - "rel": "bookmark" - } - ] - } -} diff --git a/doc/api_samples/os-config-drive/servers-config-drive-details-resp.json b/doc/api_samples/os-config-drive/servers-config-drive-details-resp.json deleted file mode 100644 index e78d1f3b26..0000000000 --- a/doc/api_samples/os-config-drive/servers-config-drive-details-resp.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "servers": [ - { - "accessIPv4": "1.2.3.4", - "accessIPv6": "80fe::", - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", - "OS-EXT-IPS:type": "fixed", - "version": 4 - } - ] - }, - "created": "2013-09-22T02:33:17Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "1ed067c90341cd9d94bbe5da960922b56f107262cdc75719a0d97b78", - "id": "f0318e69-11eb-4aed-9840-59b6c72beee8", - "image": { - "id": "70a599e0-31e7-49b7-b260-868f441e862b", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "bookmark" - } - ] - }, - "key_name": null, - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/f0318e69-11eb-4aed-9840-59b6c72beee8", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/f0318e69-11eb-4aed-9840-59b6c72beee8", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "config_drive": "", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2013-09-22T02:33:19Z", - "user_id": "fake" - } - ] -} diff --git a/doc/api_samples/os-disk-config/list-servers-detail-get.json b/doc/api_samples/os-disk-config/list-servers-detail-get.json deleted file mode 100644 index b6efc57c1c..0000000000 --- a/doc/api_samples/os-disk-config/list-servers-detail-get.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "servers": [ - { - "OS-DCF:diskConfig": "AUTO", - "accessIPv4": "", - "accessIPv6": "", - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", - "OS-EXT-IPS:type": "fixed", - "version": 4 - } - ] - }, - "created": "2012-12-02T02:11:55Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/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/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "bookmark" - } - ] - }, - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/05372e62-05b9-4ee2-9343-9a1fdf2a5fda", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/05372e62-05b9-4ee2-9343-9a1fdf2a5fda", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2012-12-02T02:11:56Z", - "key_name": null, - "user_id": "fake" - } - ] -} \ No newline at end of file diff --git a/doc/api_samples/os-disk-config/server-get-resp.json b/doc/api_samples/os-disk-config/server-get-resp.json deleted file mode 100644 index 643f711384..0000000000 --- a/doc/api_samples/os-disk-config/server-get-resp.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "server": { - "OS-DCF:diskConfig": "AUTO", - "accessIPv4": "", - "accessIPv6": "", - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", - "OS-EXT-IPS:type": "fixed", - "version": 4 - } - ] - }, - "created": "2012-12-02T02:11:55Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/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/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "bookmark" - } - ] - }, - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/5046e2f2-3b33-4041-b3cf-e085f73e78e7", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/5046e2f2-3b33-4041-b3cf-e085f73e78e7", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2012-12-02T02:11:55Z", - "key_name": null, - "user_id": "fake" - } -} \ No newline at end of file diff --git a/doc/api_samples/os-disk-config/server-post-req.json b/doc/api_samples/os-disk-config/server-post-req.json deleted file mode 100644 index 439f9b97ac..0000000000 --- a/doc/api_samples/os-disk-config/server-post-req.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "server" : { - "name" : "new-server-test", - "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b", - "flavorRef" : "1", - "metadata" : { - "My Server Name" : "Apache1" - } - } -} diff --git a/doc/api_samples/os-disk-config/server-post-resp.json b/doc/api_samples/os-disk-config/server-post-resp.json deleted file mode 100644 index 79614ccabe..0000000000 --- a/doc/api_samples/os-disk-config/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/6f70656e737461636b20342065766572/servers/324dfb7d-f4a9-419a-9a19-237df04b443b", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/324dfb7d-f4a9-419a-9a19-237df04b443b", - "rel": "bookmark" - } - ] - } -} \ No newline at end of file diff --git a/doc/api_samples/os-extended-server-attributes/server-get-resp.json b/doc/api_samples/os-extended-server-attributes/server-get-resp.json deleted file mode 100644 index 4e9452c7e9..0000000000 --- a/doc/api_samples/os-extended-server-attributes/server-get-resp.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "server": { - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", - "OS-EXT-IPS:type": "fixed", - "version": 4 - } - ] - }, - "created": "2013-09-16T02:55:07Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "3bf189131c61d0e71b0a8686a897a0f50d1693b48c47b721fe77155b", - "id": "c278163e-36f9-4cf2-b1ac-80db4c63f7a8", - "image": { - "id": "70a599e0-31e7-49b7-b260-868f441e862b", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "bookmark" - } - ] - }, - "key_name": null, - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/c278163e-36f9-4cf2-b1ac-80db4c63f7a8", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/c278163e-36f9-4cf2-b1ac-80db4c63f7a8", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "OS-EXT-SRV-ATTR:host": "c5f474bf81474f9dbbc404d5b2e4e9b3", - "OS-EXT-SRV-ATTR:hypervisor_hostname": "fake-mini", - "OS-EXT-SRV-ATTR:instance_name": "instance-00000001", - "accessIPv4": "1.2.3.4", - "accessIPv6": "80fe::", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2013-09-16T02:55:08Z", - "user_id": "fake" - } -} diff --git a/doc/api_samples/os-extended-server-attributes/server-post-resp.json b/doc/api_samples/os-extended-server-attributes/server-post-resp.json deleted file mode 100644 index 9b72d53c9e..0000000000 --- a/doc/api_samples/os-extended-server-attributes/server-post-resp.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "server": { - "adminPass": "UCvmH8nHXm66", - "id": "a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46", - "links": [ - { - "href": "http://openstack.example.com/v3/servers/a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46", - "rel": "self" - }, - { - "href": "http://openstack.example.com/servers/a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46", - "rel": "bookmark" - } - ] - } -} diff --git a/doc/api_samples/os-extended-server-attributes/servers-detail-resp.json b/doc/api_samples/os-extended-server-attributes/servers-detail-resp.json deleted file mode 100644 index 81e792e4e6..0000000000 --- a/doc/api_samples/os-extended-server-attributes/servers-detail-resp.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "servers": [ - { - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", - "OS-EXT-IPS:type": "fixed", - "version": 4 - } - ] - }, - "created": "2013-09-16T02:55:03Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "63cf07a9fd82e1d2294926ec5c0d2e1e0ca449224246df75e16f23dc", - "id": "a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46", - "image": { - "id": "70a599e0-31e7-49b7-b260-868f441e862b", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "bookmark" - } - ] - }, - "key_name": null, - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "OS-EXT-SRV-ATTR:host": "bc8efe4fdb7148a4bb921a2b03d17de6", - "OS-EXT-SRV-ATTR:hypervisor_hostname": "fake-mini", - "OS-EXT-SRV-ATTR:instance_name": "instance-00000001", - "accessIPv4": "1.2.3.4", - "accessIPv6": "80fe::", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2013-09-16T02:55:05Z", - "user_id": "fake" - } - ] -} diff --git a/doc/api_samples/os-extended-server-attributes/v2.16/server-get-resp.json b/doc/api_samples/os-extended-server-attributes/v2.16/server-get-resp.json deleted file mode 100644 index aa4afc5f4c..0000000000 --- a/doc/api_samples/os-extended-server-attributes/v2.16/server-get-resp.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "server": { - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", - "OS-EXT-IPS:type": "fixed", - "version": 4 - } - ] - }, - "created": "2013-09-16T02:55:07Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "3bf189131c61d0e71b0a8686a897a0f50d1693b48c47b721fe77155b", - "id": "c278163e-36f9-4cf2-b1ac-80db4c63f7a8", - "image": { - "id": "70a599e0-31e7-49b7-b260-868f441e862b", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "bookmark" - } - ] - }, - "key_name": null, - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/c278163e-36f9-4cf2-b1ac-80db4c63f7a8", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/c278163e-36f9-4cf2-b1ac-80db4c63f7a8", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "OS-EXT-SRV-ATTR:host": "c5f474bf81474f9dbbc404d5b2e4e9b3", - "OS-EXT-SRV-ATTR:hypervisor_hostname": "fake-mini", - "OS-EXT-SRV-ATTR:instance_name": "instance-00000001", - "OS-EXT-SRV-ATTR:hostname": "new-server-test", - "OS-EXT-SRV-ATTR:launch_index": 0, - "OS-EXT-SRV-ATTR:reservation_id": "r-12345678", - "OS-EXT-SRV-ATTR:root_device_name": "/dev/sda", - "OS-EXT-SRV-ATTR:kernel_id": null, - "OS-EXT-SRV-ATTR:ramdisk_id": null, - "OS-EXT-SRV-ATTR:user_data": null, - "locked": false, - "accessIPv4": "1.2.3.4", - "accessIPv6": "80fe::", - "progress": 0, - "status": "ACTIVE", - "host_status": "UP", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2013-09-16T02:55:08Z", - "user_id": "fake" - } -} diff --git a/doc/api_samples/os-extended-server-attributes/v2.16/servers-detail-resp.json b/doc/api_samples/os-extended-server-attributes/v2.16/servers-detail-resp.json deleted file mode 100644 index 5548c8db14..0000000000 --- a/doc/api_samples/os-extended-server-attributes/v2.16/servers-detail-resp.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "servers": [ - { - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", - "OS-EXT-IPS:type": "fixed", - "version": 4 - } - ] - }, - "created": "2013-09-16T02:55:03Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "63cf07a9fd82e1d2294926ec5c0d2e1e0ca449224246df75e16f23dc", - "id": "a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46", - "image": { - "id": "70a599e0-31e7-49b7-b260-868f441e862b", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "bookmark" - } - ] - }, - "key_name": null, - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "OS-EXT-SRV-ATTR:host": "bc8efe4fdb7148a4bb921a2b03d17de6", - "OS-EXT-SRV-ATTR:hypervisor_hostname": "fake-mini", - "OS-EXT-SRV-ATTR:instance_name": "instance-00000001", - "OS-EXT-SRV-ATTR:hostname": "new-server-test", - "OS-EXT-SRV-ATTR:launch_index": 0, - "OS-EXT-SRV-ATTR:reservation_id": "r-12345678", - "OS-EXT-SRV-ATTR:root_device_name": "/dev/sda", - "OS-EXT-SRV-ATTR:kernel_id": null, - "OS-EXT-SRV-ATTR:ramdisk_id": null, - "OS-EXT-SRV-ATTR:user_data": null, - "locked": false, - "accessIPv4": "1.2.3.4", - "accessIPv6": "80fe::", - "progress": 0, - "status": "ACTIVE", - "host_status": "UP", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2013-09-16T02:55:05Z", - "user_id": "fake" - } - ] -} diff --git a/doc/api_samples/os-extended-server-attributes/v2.3/server-get-resp.json b/doc/api_samples/os-extended-server-attributes/v2.3/server-get-resp.json deleted file mode 100644 index 8e6d0d350c..0000000000 --- a/doc/api_samples/os-extended-server-attributes/v2.3/server-get-resp.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "server": { - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", - "OS-EXT-IPS:type": "fixed", - "version": 4 - } - ] - }, - "created": "2013-09-16T02:55:07Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "3bf189131c61d0e71b0a8686a897a0f50d1693b48c47b721fe77155b", - "id": "c278163e-36f9-4cf2-b1ac-80db4c63f7a8", - "image": { - "id": "70a599e0-31e7-49b7-b260-868f441e862b", - "links": [ - { - "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "bookmark" - } - ] - }, - "key_name": null, - "links": [ - { - "href": "http://openstack.example.com/v3/servers/c278163e-36f9-4cf2-b1ac-80db4c63f7a8", - "rel": "self" - }, - { - "href": "http://openstack.example.com/servers/c278163e-36f9-4cf2-b1ac-80db4c63f7a8", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "OS-EXT-SRV-ATTR:host": "c5f474bf81474f9dbbc404d5b2e4e9b3", - "OS-EXT-SRV-ATTR:hypervisor_hostname": "fake-mini", - "OS-EXT-SRV-ATTR:instance_name": "instance-00000001", - "OS-EXT-SRV-ATTR:reservation_id": "r-00000001", - "OS-EXT-SRV-ATTR:launch_index": 0, - "OS-EXT-SRV-ATTR:kernel_id": "a5f474bf81474f9dbbc404d5b2e4e9b3", - "OS-EXT-SRV-ATTR:ramdisk_id": "b5f474bf81474f9dbbc404d5b2e4e9b3", - "OS-EXT-SRV-ATTR:hostname": "fake-hostname", - "OS-EXT-SRV-ATTR:root_device_name": "/dev/vda", - "OS-EXT-SRV-ATTR:userdata": "fake", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2013-09-16T02:55:08Z", - "user_id": "fake" - } -} diff --git a/doc/api_samples/os-extended-server-attributes/v2.3/servers-detail-resp.json b/doc/api_samples/os-extended-server-attributes/v2.3/servers-detail-resp.json deleted file mode 100644 index 6695ee22e5..0000000000 --- a/doc/api_samples/os-extended-server-attributes/v2.3/servers-detail-resp.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "servers": [ - { - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", - "OS-EXT-IPS:type": "fixed", - "version": 4 - } - ] - }, - "created": "2013-09-16T02:55:03Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "63cf07a9fd82e1d2294926ec5c0d2e1e0ca449224246df75e16f23dc", - "id": "a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46", - "image": { - "id": "70a599e0-31e7-49b7-b260-868f441e862b", - "links": [ - { - "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "bookmark" - } - ] - }, - "key_name": null, - "links": [ - { - "href": "http://openstack.example.com/v3/servers/a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46", - "rel": "self" - }, - { - "href": "http://openstack.example.com/servers/a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "OS-EXT-SRV-ATTR:host": "bc8efe4fdb7148a4bb921a2b03d17de6", - "OS-EXT-SRV-ATTR:hypervisor_hostname": "fake-mini", - "OS-EXT-SRV-ATTR:instance_name": "instance-00000001", - "OS-EXT-SRV-ATTR:reservation_id": "r-00000001", - "OS-EXT-SRV-ATTR:launch_index": 0, - "OS-EXT-SRV-ATTR:kernel_id": "a5f474bf81474f9dbbc404d5b2e4e9b3", - "OS-EXT-SRV-ATTR:ramdisk_id": "b5f474bf81474f9dbbc404d5b2e4e9b3", - "OS-EXT-SRV-ATTR:hostname": "fake-hostname", - "OS-EXT-SRV-ATTR:root_device_name": "/dev/vda", - "OS-EXT-SRV-ATTR:userdata": "fake", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2013-09-16T02:55:05Z", - "user_id": "fake" - } - ] -} diff --git a/doc/api_samples/os-extended-volumes/server-get-resp.json b/doc/api_samples/os-extended-volumes/server-get-resp.json deleted file mode 100644 index fd55c36b95..0000000000 --- a/doc/api_samples/os-extended-volumes/server-get-resp.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "server": { - "accessIPv4": "1.2.3.4", - "accessIPv6": "80fe::", - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", - "OS-EXT-IPS:type": "fixed", - "version": 4 - } - ] - }, - "created": "2013-09-16T03:22:28Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "8feef92e2152b9970b51dbdade024afbec7f8f03daf7cb335a3c1cb9", - "id": "7d62983e-23df-4320-bc89-bbc77f2a2e40", - "image": { - "id": "70a599e0-31e7-49b7-b260-868f441e862b", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "bookmark" - } - ] - }, - "key_name": null, - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/7d62983e-23df-4320-bc89-bbc77f2a2e40", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/7d62983e-23df-4320-bc89-bbc77f2a2e40", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "os-extended-volumes:volumes_attached": [ - { - "id": "volume_id1" - }, - { - "id": "volume_id2" - } - ], - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2013-09-16T03:22:29Z", - "user_id": "fake" - } -} diff --git a/doc/api_samples/os-extended-volumes/servers-detail-resp.json b/doc/api_samples/os-extended-volumes/servers-detail-resp.json deleted file mode 100644 index 02df402822..0000000000 --- a/doc/api_samples/os-extended-volumes/servers-detail-resp.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "servers": [ - { - "accessIPv4": "1.2.3.4", - "accessIPv6": "80fe::", - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", - "OS-EXT-IPS:type": "fixed", - "version": 4 - } - ] - }, - "created": "2013-09-16T03:22:32Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "f9622ec1b5ab6e3785661ea1c1e0294f95aecbcf27ac4cb60b06bd02", - "id": "8e479732-7701-48cd-af7a-04d84f51b742", - "image": { - "id": "70a599e0-31e7-49b7-b260-868f441e862b", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "bookmark" - } - ] - }, - "key_name": null, - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/8e479732-7701-48cd-af7a-04d84f51b742", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/8e479732-7701-48cd-af7a-04d84f51b742", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "os-extended-volumes:volumes_attached": [ - { - "id": "volume_id1" - }, - { - "id": "volume_id2" - } - ], - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2013-09-16T03:22:34Z", - "user_id": "fake" - } - ] -} diff --git a/doc/api_samples/os-extended-volumes/v2.3/server-get-resp.json b/doc/api_samples/os-extended-volumes/v2.3/server-get-resp.json deleted file mode 100644 index e984753847..0000000000 --- a/doc/api_samples/os-extended-volumes/v2.3/server-get-resp.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "server": { - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", - "OS-EXT-IPS:type": "fixed", - "version": 4 - } - ] - }, - "created": "2013-09-16T03:22:28Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "8feef92e2152b9970b51dbdade024afbec7f8f03daf7cb335a3c1cb9", - "id": "7d62983e-23df-4320-bc89-bbc77f2a2e40", - "image": { - "id": "70a599e0-31e7-49b7-b260-868f441e862b", - "links": [ - { - "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "bookmark" - } - ] - }, - "key_name": null, - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/7d62983e-23df-4320-bc89-bbc77f2a2e40", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/7d62983e-23df-4320-bc89-bbc77f2a2e40", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "os-extended-volumes:volumes_attached": [ - { - "id": "volume_id1", - "delete_on_termination": "True" - }, - { - "id": "volume_id2", - "delete_on_termination": "False" - } - ], - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2013-09-16T03:22:29Z", - "user_id": "fake" - } -} diff --git a/doc/api_samples/os-extended-volumes/v2.3/servers-detail-resp.json b/doc/api_samples/os-extended-volumes/v2.3/servers-detail-resp.json deleted file mode 100644 index 040f7baaaf..0000000000 --- a/doc/api_samples/os-extended-volumes/v2.3/servers-detail-resp.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "servers": [ - { - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", - "OS-EXT-IPS:type": "fixed", - "version": 4 - } - ] - }, - "created": "2013-09-16T03:22:32Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "f9622ec1b5ab6e3785661ea1c1e0294f95aecbcf27ac4cb60b06bd02", - "id": "8e479732-7701-48cd-af7a-04d84f51b742", - "image": { - "id": "70a599e0-31e7-49b7-b260-868f441e862b", - "links": [ - { - "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "bookmark" - } - ] - }, - "key_name": null, - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/8e479732-7701-48cd-af7a-04d84f51b742", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/8e479732-7701-48cd-af7a-04d84f51b742", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "os-extended-volumes:volumes_attached": [ - { - "id": "volume_id1", - "delete_on_termination": "True" - }, - { - "id": "volume_id2", - "delete_on_termination": "False" - } - ], - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2013-09-16T03:22:34Z", - "user_id": "fake" - } - ] -} diff --git a/doc/api_samples/os-hide-server-addresses/server-get-resp.json b/doc/api_samples/os-hide-server-addresses/server-get-resp.json index 877295cd29..e72c78649d 100644 --- a/doc/api_samples/os-hide-server-addresses/server-get-resp.json +++ b/doc/api_samples/os-hide-server-addresses/server-get-resp.json @@ -48,7 +48,10 @@ "OS-EXT-STS:power_state": 1, "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", - "os-extended-volumes:volumes_attached": [], + "os-extended-volumes:volumes_attached": [ + {"id": "volume_id1"}, + {"id": "volume_id2"} + ], "OS-SRV-USG:launched_at": "2013-09-23T13:37:00.880302", "OS-SRV-USG:terminated_at": null, "progress": 0, diff --git a/doc/api_samples/os-hide-server-addresses/servers-details-resp.json b/doc/api_samples/os-hide-server-addresses/servers-details-resp.json index 766bb7b073..e414e49224 100644 --- a/doc/api_samples/os-hide-server-addresses/servers-details-resp.json +++ b/doc/api_samples/os-hide-server-addresses/servers-details-resp.json @@ -49,7 +49,10 @@ "OS-EXT-STS:power_state": 1, "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", - "os-extended-volumes:volumes_attached": [], + "os-extended-volumes:volumes_attached": [ + {"id": "volume_id1"}, + {"id": "volume_id2"} + ], "OS-SRV-USG:launched_at": "2013-09-23T13:53:12.774549", "OS-SRV-USG:terminated_at": null, "progress": 0, diff --git a/doc/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json b/doc/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json index e99905807d..aa0a43a0b7 100644 --- a/doc/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json +++ b/doc/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json @@ -1,5 +1,6 @@ { "server": { + "OS-DCF:diskConfig": "AUTO", "adminPass": "wfksH3GTTseP", "id": "440cf918-3ee0-4143-b289-f63e1d2000e6", "links": [ @@ -11,6 +12,11 @@ "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/440cf918-3ee0-4143-b289-f63e1d2000e6", "rel": "bookmark" } + ], + "security_groups": [ + { + "name": "default" + } ] } } diff --git a/doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json b/doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json index 8ca9c86d69..38ef12daaa 100644 --- a/doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json +++ b/doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json @@ -1,5 +1,6 @@ { "server": { + "OS-DCF:diskConfig": "AUTO", "accessIPv4": "1.2.3.4", "accessIPv6": "80fe::", "addresses": { diff --git a/doc/api_samples/os-rescue/server-get-resp-rescue.json b/doc/api_samples/os-rescue/server-get-resp-rescue.json index 1f0c426789..62e741a434 100644 --- a/doc/api_samples/os-rescue/server-get-resp-rescue.json +++ b/doc/api_samples/os-rescue/server-get-resp-rescue.json @@ -51,6 +51,23 @@ "status": "RESCUE", "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-18T07:22:11Z", - "user_id": "fake" + "user_id": "fake", + "config_drive": "", + "OS-DCF:diskConfig": "AUTO", + "OS-EXT-AZ:availability_zone": "nova", + "OS-EXT-SRV-ATTR:host": "b8b357f7100d4391828f2177c922ef93", + "OS-EXT-SRV-ATTR:hypervisor_hostname": "fake-mini", + "OS-EXT-SRV-ATTR:instance_name": "instance-00000001", + "OS-EXT-STS:power_state": 1, + "OS-EXT-STS:task_state": null, + "OS-EXT-STS:vm_state": "rescued", + "os-extended-volumes:volumes_attached": [], + "OS-SRV-USG:launched_at": "2013-09-23T13:37:00.880302", + "OS-SRV-USG:terminated_at": null, + "security_groups": [ + { + "name": "default" + } + ] } } diff --git a/doc/api_samples/os-rescue/server-get-resp-unrescue.json b/doc/api_samples/os-rescue/server-get-resp-unrescue.json index 9e9c1d5ed0..abd8fb989d 100644 --- a/doc/api_samples/os-rescue/server-get-resp-unrescue.json +++ b/doc/api_samples/os-rescue/server-get-resp-unrescue.json @@ -52,6 +52,24 @@ "status": "ACTIVE", "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-18T07:22:12Z", - "user_id": "fake" + "user_id": "fake", + "config_drive": "", + "OS-DCF:diskConfig": "AUTO", + "OS-EXT-AZ:availability_zone": "nova", + "OS-EXT-SRV-ATTR:host": "b8b357f7100d4391828f2177c922ef93", + "OS-EXT-SRV-ATTR:hypervisor_hostname": "fake-mini", + "OS-EXT-SRV-ATTR:instance_name": "instance-00000001", + "OS-EXT-STS:power_state": 1, + "OS-EXT-STS:task_state": null, + "OS-EXT-STS:vm_state": "active", + "os-extended-volumes:volumes_attached": [], + "OS-SRV-USG:launched_at": "2013-09-23T13:37:00.880302", + "OS-SRV-USG:terminated_at": null, + "progress": 0, + "security_groups": [ + { + "name": "default" + } + ] } } diff --git a/doc/api_samples/os-security-groups/server-post-resp.json b/doc/api_samples/os-security-groups/server-post-resp.json index ea8b3db52a..19a4b8d475 100644 --- a/doc/api_samples/os-security-groups/server-post-resp.json +++ b/doc/api_samples/os-security-groups/server-post-resp.json @@ -1,5 +1,6 @@ { "server": { + "OS-DCF:diskConfig": "AUTO", "adminPass": "6NpUwoz2QDRN", "id": "f5dc173b-6804-445a-a6d8-c705dad5b5eb", "links": [ diff --git a/doc/api_samples/os-server-tags/v2.26/server-tags-show-details-resp.json b/doc/api_samples/os-server-tags/v2.26/server-tags-show-details-resp.json index 70ce44223d..9a96098482 100644 --- a/doc/api_samples/os-server-tags/v2.26/server-tags-show-details-resp.json +++ b/doc/api_samples/os-server-tags/v2.26/server-tags-show-details-resp.json @@ -57,6 +57,32 @@ "key_name": null, "user_id": "fake", "locked": false, - "description": null + "description": null, + "config_drive": "", + "OS-DCF:diskConfig": "AUTO", + "OS-EXT-AZ:availability_zone": "nova", + "OS-EXT-SRV-ATTR:host": "b8b357f7100d4391828f2177c922ef93", + "OS-EXT-SRV-ATTR:hypervisor_hostname": "fake-mini", + "OS-EXT-SRV-ATTR:instance_name": "instance-00000001", + "OS-EXT-SRV-ATTR:reservation_id": "r-00000001", + "OS-EXT-SRV-ATTR:launch_index": 0, + "OS-EXT-SRV-ATTR:kernel_id": "", + "OS-EXT-SRV-ATTR:ramdisk_id": "", + "OS-EXT-SRV-ATTR:hostname": "fake-hostname", + "OS-EXT-SRV-ATTR:root_device_name": "/dev/sda", + "OS-EXT-SRV-ATTR:user_data": "", + "OS-EXT-STS:power_state": 1, + "OS-EXT-STS:task_state": null, + "OS-EXT-STS:vm_state": "active", + "os-extended-volumes:volumes_attached": [], + "OS-SRV-USG:launched_at": "2013-09-23T13:37:00.880302", + "OS-SRV-USG:terminated_at": null, + "progress": 0, + "security_groups": [ + { + "name": "default" + } + ], + "host_status": "UP" } } diff --git a/doc/api_samples/os-server-tags/v2.26/servers-tags-details-resp.json b/doc/api_samples/os-server-tags/v2.26/servers-tags-details-resp.json index 6244bc2872..e3bbe1c7da 100644 --- a/doc/api_samples/os-server-tags/v2.26/servers-tags-details-resp.json +++ b/doc/api_samples/os-server-tags/v2.26/servers-tags-details-resp.json @@ -56,7 +56,33 @@ "user_id": "fake", "locked": false, "tags": ["sometag"], - "description": null + "description": null, + "config_drive": "", + "OS-DCF:diskConfig": "AUTO", + "OS-EXT-AZ:availability_zone": "nova", + "OS-EXT-SRV-ATTR:host": "c3f14e9812ad496baf92ccfb3c61e15f", + "OS-EXT-SRV-ATTR:hypervisor_hostname": "fake-mini", + "OS-EXT-SRV-ATTR:instance_name": "instance-00000001", + "OS-EXT-SRV-ATTR:reservation_id": "r-00000001", + "OS-EXT-SRV-ATTR:launch_index": 0, + "OS-EXT-SRV-ATTR:kernel_id": "", + "OS-EXT-SRV-ATTR:ramdisk_id": "", + "OS-EXT-SRV-ATTR:hostname": "fake-hostname", + "OS-EXT-SRV-ATTR:root_device_name": "/dev/sda", + "OS-EXT-SRV-ATTR:user_data": "", + "OS-EXT-STS:power_state": 1, + "OS-EXT-STS:task_state": null, + "OS-EXT-STS:vm_state": "active", + "os-extended-volumes:volumes_attached": [], + "OS-SRV-USG:launched_at": "2013-09-23T13:53:12.774549", + "OS-SRV-USG:terminated_at": null, + "progress": 0, + "security_groups": [ + { + "name": "default" + } + ], + "host_status": "UP" } ] } diff --git a/doc/api_samples/servers/server-create-req.json b/doc/api_samples/servers/server-create-req.json index 91b24bb441..25a99d8d3f 100644 --- a/doc/api_samples/servers/server-create-req.json +++ b/doc/api_samples/servers/server-create-req.json @@ -5,6 +5,8 @@ "name" : "new-server-test", "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b", "flavorRef" : "1", + "availability_zone": "nova", + "OS-DCF:diskConfig": "AUTO", "metadata" : { "My Server Name" : "Apache1" }, diff --git a/doc/api_samples/servers/server-get-resp.json b/doc/api_samples/servers/server-get-resp.json index 64a954c762..6c1e246f7c 100644 --- a/doc/api_samples/servers/server-get-resp.json +++ b/doc/api_samples/servers/server-get-resp.json @@ -57,7 +57,14 @@ "OS-EXT-STS:power_state": 1, "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", - "os-extended-volumes:volumes_attached": [], + "os-extended-volumes:volumes_attached": [ + { + "id": "volume_id1" + }, + { + "id": "volume_id2" + } + ], "OS-SRV-USG:launched_at": "2013-09-23T13:37:00.880302", "OS-SRV-USG:terminated_at": null, "progress": 0, diff --git a/doc/api_samples/servers/servers-details-resp.json b/doc/api_samples/servers/servers-details-resp.json index 1c877c5df6..07c6fd3aaa 100644 --- a/doc/api_samples/servers/servers-details-resp.json +++ b/doc/api_samples/servers/servers-details-resp.json @@ -58,7 +58,14 @@ "OS-EXT-STS:power_state": 1, "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", - "os-extended-volumes:volumes_attached": [], + "os-extended-volumes:volumes_attached": [ + { + "id": "volume_id1" + }, + { + "id": "volume_id2" + } + ], "OS-SRV-USG:launched_at": "2013-09-23T13:53:12.774549", "OS-SRV-USG:terminated_at": null, "progress": 0, diff --git a/doc/api_samples/servers/v2.16/server-get-resp.json b/doc/api_samples/servers/v2.16/server-get-resp.json index ee500305c2..e39236f125 100644 --- a/doc/api_samples/servers/v2.16/server-get-resp.json +++ b/doc/api_samples/servers/v2.16/server-get-resp.json @@ -1,7 +1,5 @@ { "server": { - "accessIPv4": "1.2.3.4", - "accessIPv6": "80fe::", "addresses": { "private": [ { @@ -12,7 +10,7 @@ } ] }, - "created": "2013-09-03T04:01:32Z", + "created": "2013-09-16T02:55:07Z", "flavor": { "id": "1", "links": [ @@ -22,8 +20,8 @@ } ] }, - "hostId": "92154fab69d5883ba2c8622b7e65f745dd33257221c07af363c51b29", - "id": "0e44cc9c-e052-415d-afbf-469b0d384170", + "hostId": "3bf189131c61d0e71b0a8686a897a0f50d1693b48c47b721fe77155b", + "id": "c278163e-36f9-4cf2-b1ac-80db4c63f7a8", "image": { "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ @@ -36,11 +34,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/0e44cc9c-e052-415d-afbf-469b0d384170", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/c278163e-36f9-4cf2-b1ac-80db4c63f7a8", "rel": "self" }, { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/0e44cc9c-e052-415d-afbf-469b0d384170", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/c278163e-36f9-4cf2-b1ac-80db4c63f7a8", "rel": "bookmark" } ], @@ -48,11 +46,47 @@ "My Server Name": "Apache1" }, "name": "new-server-test", + "config_drive": "", + "OS-DCF:diskConfig": "AUTO", + "OS-EXT-AZ:availability_zone": "nova", + "OS-EXT-SRV-ATTR:host": "c5f474bf81474f9dbbc404d5b2e4e9b3", + "OS-EXT-SRV-ATTR:hypervisor_hostname": "fake-mini", + "OS-EXT-SRV-ATTR:instance_name": "instance-00000001", + "OS-EXT-SRV-ATTR:hostname": "new-server-test", + "OS-EXT-SRV-ATTR:launch_index": 0, + "OS-EXT-SRV-ATTR:reservation_id": "r-12345678", + "OS-EXT-SRV-ATTR:root_device_name": "/dev/sda", + "OS-EXT-SRV-ATTR:kernel_id": null, + "OS-EXT-SRV-ATTR:ramdisk_id": null, + "OS-EXT-SRV-ATTR:user_data": null, + "OS-EXT-STS:power_state": 1, + "OS-EXT-STS:task_state": null, + "OS-EXT-STS:vm_state": "active", + "os-extended-volumes:volumes_attached": [ + { + "id": "volume_id1", + "delete_on_termination": false + }, + { + "id": "volume_id2", + "delete_on_termination": false + } + ], + "OS-SRV-USG:launched_at": "2013-09-23T13:37:00.880302", + "OS-SRV-USG:terminated_at": null, + "security_groups": [ + { + "name": "default" + } + ], + "locked": false, + "accessIPv4": "1.2.3.4", + "accessIPv6": "80fe::", "progress": 0, "status": "ACTIVE", "host_status": "UP", "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2013-09-03T04:01:33Z", + "updated": "2013-09-16T02:55:08Z", "user_id": "fake" } } diff --git a/doc/api_samples/servers/v2.16/servers-details-resp.json b/doc/api_samples/servers/v2.16/servers-details-resp.json index 2b24f82b46..ce7354f2e9 100644 --- a/doc/api_samples/servers/v2.16/servers-details-resp.json +++ b/doc/api_samples/servers/v2.16/servers-details-resp.json @@ -1,8 +1,6 @@ { "servers": [ { - "accessIPv4": "1.2.3.4", - "accessIPv6": "80fe::", "addresses": { "private": [ { @@ -13,7 +11,7 @@ } ] }, - "created": "2013-09-03T04:01:32Z", + "created": "2013-09-16T02:55:03Z", "flavor": { "id": "1", "links": [ @@ -23,8 +21,8 @@ } ] }, - "hostId": "bcf92836fc9ed4203a75cb0337afc7f917d2be504164b995c2334b25", - "id": "f5dc173b-6804-445a-a6d8-c705dad5b5eb", + "hostId": "63cf07a9fd82e1d2294926ec5c0d2e1e0ca449224246df75e16f23dc", + "id": "a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46", "image": { "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ @@ -37,11 +35,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46", "rel": "self" }, { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46", "rel": "bookmark" } ], @@ -49,11 +47,47 @@ "My Server Name": "Apache1" }, "name": "new-server-test", + "config_drive": "", + "OS-DCF:diskConfig": "AUTO", + "OS-EXT-AZ:availability_zone": "nova", + "OS-EXT-SRV-ATTR:host": "bc8efe4fdb7148a4bb921a2b03d17de6", + "OS-EXT-SRV-ATTR:hypervisor_hostname": "fake-mini", + "OS-EXT-SRV-ATTR:instance_name": "instance-00000001", + "OS-EXT-SRV-ATTR:hostname": "new-server-test", + "OS-EXT-SRV-ATTR:launch_index": 0, + "OS-EXT-SRV-ATTR:reservation_id": "r-12345678", + "OS-EXT-SRV-ATTR:root_device_name": "/dev/sda", + "OS-EXT-SRV-ATTR:kernel_id": null, + "OS-EXT-SRV-ATTR:ramdisk_id": null, + "OS-EXT-SRV-ATTR:user_data": null, + "locked": false, + "accessIPv4": "1.2.3.4", + "accessIPv6": "80fe::", + "OS-EXT-STS:power_state": 1, + "OS-EXT-STS:task_state": null, + "OS-EXT-STS:vm_state": "active", + "os-extended-volumes:volumes_attached": [ + { + "id": "volume_id1", + "delete_on_termination": false + }, + { + "id": "volume_id2", + "delete_on_termination": false + } + ], + "OS-SRV-USG:launched_at": "2013-09-23T13:53:12.774549", + "OS-SRV-USG:terminated_at": null, "progress": 0, + "security_groups": [ + { + "name": "default" + } + ], "status": "ACTIVE", "host_status": "UP", "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2013-09-03T04:01:32Z", + "updated": "2013-09-16T02:55:05Z", "user_id": "fake" } ] diff --git a/doc/api_samples/servers/v2.16/servers-list-resp.json b/doc/api_samples/servers/v2.16/servers-list-resp.json new file mode 100644 index 0000000000..f4b2ce3802 --- /dev/null +++ b/doc/api_samples/servers/v2.16/servers-list-resp.json @@ -0,0 +1,18 @@ +{ + "servers": [ + { + "id": "22c91117-08de-4894-9aa9-6ef382400985", + "links": [ + { + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/22c91117-08de-4894-9aa9-6ef382400985", + "rel": "self" + }, + { + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/22c91117-08de-4894-9aa9-6ef382400985", + "rel": "bookmark" + } + ], + "name": "new-server-test" + } + ] +} \ No newline at end of file diff --git a/doc/api_samples/servers/v2.19/server-action-rebuild-resp.json b/doc/api_samples/servers/v2.19/server-action-rebuild-resp.json index e17d95274c..b38d40709d 100644 --- a/doc/api_samples/servers/v2.19/server-action-rebuild-resp.json +++ b/doc/api_samples/servers/v2.19/server-action-rebuild-resp.json @@ -50,6 +50,7 @@ "description" : "description of foobar", "progress": 0, "status": "ACTIVE", + "OS-DCF:diskConfig": "AUTO", "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-11-14T06:29:02Z", "user_id": "fake" diff --git a/doc/api_samples/servers/v2.19/server-get-resp.json b/doc/api_samples/servers/v2.19/server-get-resp.json index e5ec3a3161..3fd3bc9361 100644 --- a/doc/api_samples/servers/v2.19/server-get-resp.json +++ b/doc/api_samples/servers/v2.19/server-get-resp.json @@ -66,7 +66,16 @@ "OS-EXT-STS:power_state": 1, "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", - "os-extended-volumes:volumes_attached": [], + "os-extended-volumes:volumes_attached": [ + { + "id": "volume_id1", + "delete_on_termination": false + }, + { + "id": "volume_id2", + "delete_on_termination": false + } + ], "OS-SRV-USG:launched_at": "2013-09-23T13:37:00.880302", "OS-SRV-USG:terminated_at": null, "progress": 0, diff --git a/doc/api_samples/servers/v2.19/servers-details-resp.json b/doc/api_samples/servers/v2.19/servers-details-resp.json index f42cdc0425..db3905f7b0 100644 --- a/doc/api_samples/servers/v2.19/servers-details-resp.json +++ b/doc/api_samples/servers/v2.19/servers-details-resp.json @@ -67,7 +67,16 @@ "OS-EXT-STS:power_state": 1, "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", - "os-extended-volumes:volumes_attached": [], + "os-extended-volumes:volumes_attached": [ + { + "id": "volume_id1", + "delete_on_termination": false + }, + { + "id": "volume_id2", + "delete_on_termination": false + } + ], "OS-SRV-USG:launched_at": "2013-09-23T13:53:12.774549", "OS-SRV-USG:terminated_at": null, "progress": 0, diff --git a/doc/api_samples/servers/v2.9/server-get-resp.json b/doc/api_samples/servers/v2.9/server-get-resp.json index 6dc32bc840..2e3c7b3b8a 100644 --- a/doc/api_samples/servers/v2.9/server-get-resp.json +++ b/doc/api_samples/servers/v2.9/server-get-resp.json @@ -64,7 +64,16 @@ "OS-EXT-STS:power_state": 1, "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", - "os-extended-volumes:volumes_attached": [], + "os-extended-volumes:volumes_attached": [ + { + "id": "volume_id1", + "delete_on_termination": false + }, + { + "id": "volume_id2", + "delete_on_termination": false + } + ], "OS-SRV-USG:launched_at": "2013-09-23T13:37:00.880302", "OS-SRV-USG:terminated_at": null, "progress": 0, diff --git a/doc/api_samples/servers/v2.9/servers-details-resp.json b/doc/api_samples/servers/v2.9/servers-details-resp.json index 4136eb0d7c..a944c304eb 100644 --- a/doc/api_samples/servers/v2.9/servers-details-resp.json +++ b/doc/api_samples/servers/v2.9/servers-details-resp.json @@ -65,7 +65,16 @@ "OS-EXT-STS:power_state": 1, "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", - "os-extended-volumes:volumes_attached": [], + "os-extended-volumes:volumes_attached": [ + { + "id": "volume_id1", + "delete_on_termination": false + }, + { + "id": "volume_id2", + "delete_on_termination": false + } + ], "OS-SRV-USG:launched_at": "2013-09-23T13:53:12.774549", "OS-SRV-USG:terminated_at": null, "progress": 0, diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-get-resp.json.tpl deleted file mode 100644 index a090795d08..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-get-resp.json.tpl +++ /dev/null @@ -1,57 +0,0 @@ -{ - "server": { - "accessIPv4": "%(access_ip_v4)s", - "accessIPv6": "%(access_ip_v6)s", - "addresses": { - "private": [ - { - "addr": "%(ip)s", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", - "OS-EXT-IPS:type": "fixed", - "version": 4 - } - ] - }, - "created": "%(isotime)s", - "flavor": { - "id": "1", - "links": [ - { - "href": "%(compute_endpoint)s/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "%(hostid)s", - "id": "%(id)s", - "image": { - "id": "%(uuid)s", - "links": [ - { - "href": "%(compute_endpoint)s/images/%(uuid)s", - "rel": "bookmark" - } - ] - }, - "links": [ - { - "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/servers/%(uuid)s", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "%(isotime)s", - "user_id": "fake", - "key_name": null - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-post-req.json.tpl deleted file mode 100644 index 25b6415890..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-post-req.json.tpl +++ /dev/null @@ -1,12 +0,0 @@ -{ - "server" : { - "accessIPv4": "%(access_ip_v4)s", - "accessIPv6": "%(access_ip_v6)s", - "name" : "new-server-test", - "imageRef" : "%(image_id)s", - "flavorRef" : "1", - "metadata" : { - "My Server Name" : "Apache1" - } - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-post-resp.json.tpl deleted file mode 100644 index 5358868400..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-post-resp.json.tpl +++ /dev/null @@ -1,16 +0,0 @@ -{ - "server": { - "adminPass": "%(password)s", - "id": "%(id)s", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/servers/%(uuid)s", - "rel": "bookmark" - } - ] - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/servers-details-resp.json.tpl deleted file mode 100644 index f3e5f52526..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/servers-details-resp.json.tpl +++ /dev/null @@ -1,59 +0,0 @@ -{ - "servers": [ - { - "accessIPv4": "%(access_ip_v4)s", - "accessIPv6": "%(access_ip_v6)s", - "addresses": { - "private": [ - { - "addr": "%(ip)s", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", - "OS-EXT-IPS:type": "fixed", - "version": 4 - } - ] - }, - "created": "%(isotime)s", - "flavor": { - "id": "1", - "links": [ - { - "href": "%(compute_endpoint)s/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "%(hostid)s", - "id": "%(id)s", - "image": { - "id": "%(uuid)s", - "links": [ - { - "href": "%(compute_endpoint)s/images/%(uuid)s", - "rel": "bookmark" - } - ] - }, - "links": [ - { - "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/servers/%(id)s", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "%(isotime)s", - "user_id": "fake", - "key_name": null - } - ] -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl deleted file mode 100644 index 165e7a1e60..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl +++ /dev/null @@ -1,58 +0,0 @@ -{ - "server": { - "config_drive": "%(cdrive)s", - "accessIPv4": "%(access_ip_v4)s", - "accessIPv6": "%(access_ip_v6)s", - "addresses": { - "private": [ - { - "addr": "%(ip)s", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", - "OS-EXT-IPS:type": "fixed", - "version": 4 - } - ] - }, - "created": "%(isotime)s", - "flavor": { - "id": "1", - "links": [ - { - "href": "%(compute_endpoint)s/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "%(hostid)s", - "id": "%(id)s", - "image": { - "id": "%(uuid)s", - "links": [ - { - "href": "%(compute_endpoint)s/images/%(uuid)s", - "rel": "bookmark" - } - ] - }, - "links": [ - { - "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/servers/%(uuid)s", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "%(isotime)s", - "user_id": "fake", - "key_name": null - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/server-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/server-post-req.json.tpl deleted file mode 100644 index 25b6415890..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/server-post-req.json.tpl +++ /dev/null @@ -1,12 +0,0 @@ -{ - "server" : { - "accessIPv4": "%(access_ip_v4)s", - "accessIPv6": "%(access_ip_v6)s", - "name" : "new-server-test", - "imageRef" : "%(image_id)s", - "flavorRef" : "1", - "metadata" : { - "My Server Name" : "Apache1" - } - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/server-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/server-post-resp.json.tpl deleted file mode 100644 index 5358868400..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/server-post-resp.json.tpl +++ /dev/null @@ -1,16 +0,0 @@ -{ - "server": { - "adminPass": "%(password)s", - "id": "%(id)s", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/servers/%(uuid)s", - "rel": "bookmark" - } - ] - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl deleted file mode 100644 index a244eb9f46..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl +++ /dev/null @@ -1,60 +0,0 @@ -{ - "servers": [ - { - "config_drive": "%(cdrive)s", - "accessIPv4": "%(access_ip_v4)s", - "accessIPv6": "%(access_ip_v6)s", - "addresses": { - "private": [ - { - "addr": "%(ip)s", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", - "OS-EXT-IPS:type": "fixed", - "version": 4 - } - ] - }, - "created": "%(isotime)s", - "flavor": { - "id": "1", - "links": [ - { - "href": "%(compute_endpoint)s/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "%(hostid)s", - "id": "%(id)s", - "image": { - "id": "%(uuid)s", - "links": [ - { - "href": "%(compute_endpoint)s/images/%(uuid)s", - "rel": "bookmark" - } - ] - }, - "links": [ - { - "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/servers/%(id)s", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "%(isotime)s", - "user_id": "fake", - "key_name": null - } - ] -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/list-servers-detail-get.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/list-servers-detail-get.json.tpl deleted file mode 100644 index abd8ff87b9..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/list-servers-detail-get.json.tpl +++ /dev/null @@ -1,60 +0,0 @@ -{ - "servers": [ - { - "OS-DCF:diskConfig": "AUTO", - "accessIPv4": "", - "accessIPv6": "", - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", - "OS-EXT-IPS:type": "fixed", - "version": 4 - } - ] - }, - "created": "%(isotime)s", - "flavor": { - "id": "1", - "links": [ - { - "href": "%(compute_endpoint)s/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "%(hostid)s", - "id": "%(id)s", - "image": { - "id": "%(uuid)s", - "links": [ - { - "href": "%(compute_endpoint)s/images/%(uuid)s", - "rel": "bookmark" - } - ] - }, - "links": [ - { - "href": "%(versioned_compute_endpoint)s/servers/%(id)s", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/servers/%(id)s", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "%(isotime)s", - "key_name": null, - "user_id": "fake" - } - ] -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-get-resp.json.tpl deleted file mode 100644 index a224d3a94a..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-get-resp.json.tpl +++ /dev/null @@ -1,58 +0,0 @@ -{ - "server": { - "OS-DCF:diskConfig": "AUTO", - "accessIPv4": "", - "accessIPv6": "", - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", - "OS-EXT-IPS:type": "fixed", - "version": 4 - } - ] - }, - "created": "%(isotime)s", - "flavor": { - "id": "1", - "links": [ - { - "href": "%(compute_endpoint)s/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "%(hostid)s", - "id": "%(id)s", - "image": { - "id": "%(uuid)s", - "links": [ - { - "href": "%(compute_endpoint)s/images/%(uuid)s", - "rel": "bookmark" - } - ] - }, - "links": [ - { - "href": "%(versioned_compute_endpoint)s/servers/%(id)s", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/servers/%(id)s", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "%(isotime)s", - "key_name": null, - "user_id": "fake" - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-post-req.json.tpl deleted file mode 100644 index cb85465c48..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-post-req.json.tpl +++ /dev/null @@ -1,11 +0,0 @@ -{ - "server" : { - "OS-DCF:diskConfig": "AUTO", - "name" : "new-server-test", - "imageRef" : "%(image_id)s", - "flavorRef" : "1", - "metadata" : { - "My Server Name" : "Apache1" - } - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-post-resp.json.tpl deleted file mode 100644 index 4b8a4b64ba..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-post-resp.json.tpl +++ /dev/null @@ -1,17 +0,0 @@ -{ - "server": { - "OS-DCF:diskConfig": "AUTO", - "adminPass": "%(password)s", - "id": "%(id)s", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/servers/%(uuid)s", - "rel": "bookmark" - } - ] - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/server-get-resp.json.tpl deleted file mode 100644 index 8ea8ff196e..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/server-get-resp.json.tpl +++ /dev/null @@ -1,60 +0,0 @@ -{ - "server": { - "OS-EXT-SRV-ATTR:host": "%(compute_host)s", - "OS-EXT-SRV-ATTR:hypervisor_hostname": "%(hypervisor_hostname)s", - "OS-EXT-SRV-ATTR:instance_name": "%(instance_name)s", - "accessIPv4": "%(access_ip_v4)s", - "accessIPv6": "%(access_ip_v6)s", - "updated": "%(isotime)s", - "created": "%(isotime)s", - "addresses": { - "private": [ - { - "addr": "%(ip)s", - "version": 4, - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", - "OS-EXT-IPS:type": "fixed" - } - ] - }, - "flavor": { - "id": "1", - "links": [ - { - "href": "%(compute_endpoint)s/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "%(hostid)s", - "id": "%(uuid)s", - "image": { - "id": "%(uuid)s", - "links": [ - { - "href": "%(compute_endpoint)s/images/%(uuid)s", - "rel": "bookmark" - } - ] - }, - "links": [ - { - "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/servers/%(uuid)s", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "user_id": "fake", - "key_name": null - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl deleted file mode 100644 index a52dafed75..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl +++ /dev/null @@ -1,62 +0,0 @@ -{ - "servers": [ - { - "OS-EXT-SRV-ATTR:host": "%(compute_host)s", - "OS-EXT-SRV-ATTR:hypervisor_hostname": "%(hypervisor_hostname)s", - "OS-EXT-SRV-ATTR:instance_name": "%(instance_name)s", - "accessIPv4": "%(access_ip_v4)s", - "accessIPv6": "%(access_ip_v6)s", - "updated": "%(isotime)s", - "created": "%(isotime)s", - "addresses": { - "private": [ - { - "addr": "%(ip)s", - "version": 4, - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", - "OS-EXT-IPS:type": "fixed" - } - ] - }, - "flavor": { - "id": "1", - "links": [ - { - "href": "%(compute_endpoint)s/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "%(hostid)s", - "id": "%(uuid)s", - "image": { - "id": "%(uuid)s", - "links": [ - { - "href": "%(compute_endpoint)s/images/%(uuid)s", - "rel": "bookmark" - } - ] - }, - "links": [ - { - "href": "%(versioned_compute_endpoint)s/servers/%(id)s", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/servers/%(id)s", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "user_id": "fake", - "key_name": null - } - ] -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-extended-volumes/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-extended-volumes/server-get-resp.json.tpl deleted file mode 100644 index 8d2ed19396..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-extended-volumes/server-get-resp.json.tpl +++ /dev/null @@ -1,61 +0,0 @@ -{ - "server": { - "accessIPv4": "%(access_ip_v4)s", - "accessIPv6": "%(access_ip_v6)s", - "addresses": { - "private": [ - { - "addr": "%(ip)s", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", - "OS-EXT-IPS:type": "fixed", - "version": 4 - } - ] - }, - "created": "%(isotime)s", - "flavor": { - "id": "1", - "links": [ - { - "href": "%(compute_endpoint)s/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "%(hostid)s", - "id": "%(id)s", - "image": { - "id": "%(uuid)s", - "links": [ - { - "href": "%(compute_endpoint)s/images/%(uuid)s", - "rel": "bookmark" - } - ] - }, - "links": [ - { - "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/servers/%(uuid)s", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "%(isotime)s", - "user_id": "fake", - "os-extended-volumes:volumes_attached": [ - {"id": "volume_id1"}, - {"id": "volume_id2"} - ], - "key_name": null - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-extended-volumes/servers-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-extended-volumes/servers-detail-resp.json.tpl deleted file mode 100644 index a0d80bb389..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-extended-volumes/servers-detail-resp.json.tpl +++ /dev/null @@ -1,62 +0,0 @@ -{ - "servers": [ - { - "updated": "%(isotime)s", - "created": "%(isotime)s", - "accessIPv4": "%(access_ip_v4)s", - "accessIPv6": "%(access_ip_v6)s", - "addresses": { - "private": [ - { - "addr": "%(ip)s", - "version": 4, - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", - "OS-EXT-IPS:type": "fixed" - } - ] - }, - "flavor": { - "id": "1", - "links": [ - { - "href": "%(compute_endpoint)s/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "%(hostid)s", - "id": "%(uuid)s", - "image": { - "id": "%(uuid)s", - "links": [ - { - "href": "%(compute_endpoint)s/images/%(uuid)s", - "rel": "bookmark" - } - ] - }, - "links": [ - { - "href": "%(versioned_compute_endpoint)s/servers/%(id)s", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/servers/%(id)s", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "user_id": "fake", - "os-extended-volumes:volumes_attached": [ - {"id": "volume_id1"}, - {"id": "volume_id2"} - ], - "key_name": null - }] -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/server-get-resp.json.tpl index dff4fce32d..4a0cb3e111 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/server-get-resp.json.tpl @@ -49,7 +49,10 @@ "OS-EXT-STS:power_state": 1, "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", - "os-extended-volumes:volumes_attached": [], + "os-extended-volumes:volumes_attached": [ + {"id": "volume_id1"}, + {"id": "volume_id2"} + ], "OS-SRV-USG:launched_at": "%(strtime)s", "OS-SRV-USG:terminated_at": null, "progress": 0, diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl index fafd0f590c..e5ac026a90 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl @@ -49,7 +49,10 @@ "OS-EXT-STS:power_state": 1, "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", - "os-extended-volumes:volumes_attached": [], + "os-extended-volumes:volumes_attached": [ + {"id": "volume_id1"}, + {"id": "volume_id2"} + ], "OS-SRV-USG:launched_at": "%(strtime)s", "OS-SRV-USG:terminated_at": null, "progress": 0, diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json.tpl index 5358868400..4b30e0cfbd 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json.tpl @@ -1,5 +1,6 @@ { "server": { + "OS-DCF:diskConfig": "AUTO", "adminPass": "%(password)s", "id": "%(id)s", "links": [ @@ -11,6 +12,11 @@ "href": "%(compute_endpoint)s/servers/%(uuid)s", "rel": "bookmark" } + ], + "security_groups": [ + { + "name": "default" + } ] } } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json.tpl index 7d48368583..2ecc21d2a7 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral-resp.json.tpl @@ -1,5 +1,6 @@ { "server": { + "OS-DCF:diskConfig": "AUTO", "accessIPv4": "%(access_ip_v4)s", "accessIPv6": "%(access_ip_v6)s", "addresses": { diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-rescue.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-rescue.json.tpl index cddcee9d4c..bcd663f275 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-rescue.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-rescue.json.tpl @@ -51,6 +51,23 @@ "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake", - "key_name": null + "key_name": null, + "config_drive": "%(cdrive)s", + "OS-DCF:diskConfig": "AUTO", + "OS-EXT-AZ:availability_zone": "nova", + "OS-EXT-SRV-ATTR:host": "%(compute_host)s", + "OS-EXT-SRV-ATTR:hypervisor_hostname": "%(hypervisor_hostname)s", + "OS-EXT-SRV-ATTR:instance_name": "%(instance_name)s", + "OS-EXT-STS:power_state": 1, + "OS-EXT-STS:task_state": null, + "OS-EXT-STS:vm_state": "rescued", + "os-extended-volumes:volumes_attached": [], + "OS-SRV-USG:launched_at": "%(strtime)s", + "OS-SRV-USG:terminated_at": null, + "security_groups": [ + { + "name": "default" + } + ] } } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-unrescue.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-unrescue.json.tpl index e25800f3ab..cbcc8cc050 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-unrescue.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-rescue/server-get-resp-unrescue.json.tpl @@ -52,6 +52,24 @@ "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", "user_id": "fake", - "key_name": null + "key_name": null, + "config_drive": "%(cdrive)s", + "OS-DCF:diskConfig": "AUTO", + "OS-EXT-AZ:availability_zone": "nova", + "OS-EXT-SRV-ATTR:host": "%(compute_host)s", + "OS-EXT-SRV-ATTR:hypervisor_hostname": "%(hypervisor_hostname)s", + "OS-EXT-SRV-ATTR:instance_name": "%(instance_name)s", + "OS-EXT-STS:power_state": 1, + "OS-EXT-STS:task_state": null, + "OS-EXT-STS:vm_state": "active", + "os-extended-volumes:volumes_attached": [], + "OS-SRV-USG:launched_at": "%(strtime)s", + "OS-SRV-USG:terminated_at": null, + "progress": 0, + "security_groups": [ + { + "name": "default" + } + ] } } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-post-resp.json.tpl index 1117385341..30d21c96c4 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-post-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-post-resp.json.tpl @@ -1,5 +1,6 @@ { "server": { + "OS-DCF:diskConfig": "AUTO", "adminPass": "%(password)s", "id": "%(id)s", "links": [ diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-server-tags/v2.26/server-tags-show-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-server-tags/v2.26/server-tags-show-details-resp.json.tpl index a70d8ad744..3b2273d99e 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-server-tags/v2.26/server-tags-show-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-server-tags/v2.26/server-tags-show-details-resp.json.tpl @@ -57,6 +57,32 @@ "key_name": null, "user_id": "fake", "locked": false, - "description": null + "description": null, + "config_drive": "", + "OS-DCF:diskConfig": "AUTO", + "OS-EXT-AZ:availability_zone": "nova", + "OS-EXT-SRV-ATTR:host": "%(compute_host)s", + "OS-EXT-SRV-ATTR:hypervisor_hostname": "%(hypervisor_hostname)s", + "OS-EXT-SRV-ATTR:instance_name": "%(instance_name)s", + "OS-EXT-SRV-ATTR:reservation_id": "%(reservation_id)s", + "OS-EXT-SRV-ATTR:launch_index": 0, + "OS-EXT-SRV-ATTR:kernel_id": "", + "OS-EXT-SRV-ATTR:ramdisk_id": "", + "OS-EXT-SRV-ATTR:hostname": "%(hostname)s", + "OS-EXT-SRV-ATTR:root_device_name": "/dev/sda", + "OS-EXT-SRV-ATTR:user_data": "", + "OS-EXT-STS:power_state": 1, + "OS-EXT-STS:task_state": null, + "OS-EXT-STS:vm_state": "active", + "os-extended-volumes:volumes_attached": [], + "OS-SRV-USG:launched_at": "%(strtime)s", + "OS-SRV-USG:terminated_at": null, + "progress": 0, + "security_groups": [ + { + "name": "default" + } + ], + "host_status": "UP" } } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-server-tags/v2.26/servers-tags-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-server-tags/v2.26/servers-tags-details-resp.json.tpl index cca555ef4c..cc5137aa86 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-server-tags/v2.26/servers-tags-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-server-tags/v2.26/servers-tags-details-resp.json.tpl @@ -56,7 +56,33 @@ "user_id": "fake", "locked": false, "tags": ["%(tag)s"], - "description": null + "description": null, + "config_drive": "", + "OS-DCF:diskConfig": "AUTO", + "OS-EXT-AZ:availability_zone": "nova", + "OS-EXT-SRV-ATTR:host": "%(compute_host)s", + "OS-EXT-SRV-ATTR:hypervisor_hostname": "%(hypervisor_hostname)s", + "OS-EXT-SRV-ATTR:instance_name": "%(instance_name)s", + "OS-EXT-SRV-ATTR:reservation_id": "%(reservation_id)s", + "OS-EXT-SRV-ATTR:launch_index": 0, + "OS-EXT-SRV-ATTR:kernel_id": "", + "OS-EXT-SRV-ATTR:ramdisk_id": "", + "OS-EXT-SRV-ATTR:hostname": "%(hostname)s", + "OS-EXT-SRV-ATTR:root_device_name": "/dev/sda", + "OS-EXT-SRV-ATTR:user_data": "", + "OS-EXT-STS:power_state": 1, + "OS-EXT-STS:task_state": null, + "OS-EXT-STS:vm_state": "active", + "os-extended-volumes:volumes_attached": [], + "OS-SRV-USG:launched_at": "%(strtime)s", + "OS-SRV-USG:terminated_at": null, + "progress": 0, + "security_groups": [ + { + "name": "default" + } + ], + "host_status": "UP" } ] } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/attach-interfaces-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/attach-interfaces-list-resp.json.tpl new file mode 100644 index 0000000000..192f9a6487 --- /dev/null +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/attach-interfaces-list-resp.json.tpl @@ -0,0 +1,16 @@ +{ + "interfaceAttachments": [ + { + "fixed_ips": [ + { + "ip_address": "192.168.1.3", + "subnet_id": "f8a6e8f8-c2ec-497c-9f23-da9616de54ef" + } + ], + "mac_addr": "fa:16:3e:4c:2c:30", + "net_id": "3cb9bc59-5699-4588-a4b1-b87f96708bc6", + "port_id": "ce531f90-199f-48c0-816c-13e38010b442", + "port_state": "ACTIVE" + } + ] +} \ No newline at end of file diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/attach-interfaces-show-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/attach-interfaces-show-resp.json.tpl new file mode 100644 index 0000000000..9dff234366 --- /dev/null +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/attach-interfaces-show-resp.json.tpl @@ -0,0 +1,14 @@ +{ + "interfaceAttachment": { + "fixed_ips": [ + { + "ip_address": "192.168.1.3", + "subnet_id": "f8a6e8f8-c2ec-497c-9f23-da9616de54ef" + } + ], + "mac_addr": "fa:16:3e:4c:2c:30", + "net_id": "3cb9bc59-5699-4588-a4b1-b87f96708bc6", + "port_id": "ce531f90-199f-48c0-816c-13e38010b442", + "port_state": "ACTIVE" + } +} \ No newline at end of file diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/availability-zone-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/availability-zone-detail-resp.json.tpl new file mode 100644 index 0000000000..ec71675e4f --- /dev/null +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/availability-zone-detail-resp.json.tpl @@ -0,0 +1,55 @@ +{ + "availabilityZoneInfo": [ + { + "hosts": { + "conductor": { + "nova-conductor": { + "active": true, + "available": true, + "updated_at": null + } + }, + "consoleauth": { + "nova-consoleauth": { + "active": true, + "available": true, + "updated_at": null + } + }, + "network": { + "nova-network": { + "active": true, + "available": true, + "updated_at": null + } + }, + "scheduler": { + "nova-scheduler": { + "active": true, + "available": true, + "updated_at": null + } + } + }, + "zoneName": "internal", + "zoneState": { + "available": true + } + }, + { + "hosts": { + "compute": { + "nova-compute": { + "active": true, + "available": true, + "updated_at": null + } + } + }, + "zoneName": "nova", + "zoneState": { + "available": true + } + } + ] +} \ No newline at end of file diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/server-create-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/server-create-req.json.tpl index 2109fa3c38..7cba81763e 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/server-create-req.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/server-create-req.json.tpl @@ -5,6 +5,8 @@ "name" : "new-server-test", "imageRef" : "%(image_id)s", "flavorRef" : "1", + "availability_zone": "nova", + "OS-DCF:diskConfig": "AUTO", "metadata" : { "My Server Name" : "Apache1" }, diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/server-get-resp.json.tpl index 65ef37bcc4..38926326b3 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/server-get-resp.json.tpl @@ -48,7 +48,7 @@ "My Server Name": "Apache1" }, "name": "new-server-test", - "config_drive": "", + "config_drive": "%(cdrive)s", "OS-DCF:diskConfig": "AUTO", "OS-EXT-AZ:availability_zone": "nova", "OS-EXT-SRV-ATTR:host": "%(compute_host)s", @@ -57,7 +57,10 @@ "OS-EXT-STS:power_state": 1, "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", - "os-extended-volumes:volumes_attached": [], + "os-extended-volumes:volumes_attached": [ + {"id": "volume_id1"}, + {"id": "volume_id2"} + ], "OS-SRV-USG:launched_at": "%(strtime)s", "OS-SRV-USG:terminated_at": null, "progress": 0, diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/servers-details-resp.json.tpl index 9fa0cc32a9..766896fdd2 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/servers-details-resp.json.tpl @@ -49,7 +49,7 @@ "My Server Name": "Apache1" }, "name": "new-server-test", - "config_drive": "", + "config_drive": "%(cdrive)s", "OS-DCF:diskConfig": "AUTO", "OS-EXT-AZ:availability_zone": "nova", "OS-EXT-SRV-ATTR:host": "%(compute_host)s", @@ -58,7 +58,10 @@ "OS-EXT-STS:power_state": 1, "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", - "os-extended-volumes:volumes_attached": [], + "os-extended-volumes:volumes_attached": [ + {"id": "volume_id1"}, + {"id": "volume_id2"} + ], "OS-SRV-USG:launched_at": "%(strtime)s", "OS-SRV-USG:terminated_at": null, "progress": 0, diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/v2.16/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/server-get-resp.json.tpl similarity index 77% rename from nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/v2.16/server-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/server-get-resp.json.tpl index 88a67dec5b..91b8edd5f9 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/v2.16/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/server-get-resp.json.tpl @@ -1,5 +1,8 @@ { "server": { + "config_drive": "", + "OS-DCF:diskConfig": "AUTO", + "OS-EXT-AZ:availability_zone": "nova", "OS-EXT-SRV-ATTR:host": "%(compute_host)s", "OS-EXT-SRV-ATTR:hypervisor_hostname": "%(hypervisor_hostname)s", "OS-EXT-SRV-ATTR:instance_name": "%(instance_name)s", @@ -10,6 +13,20 @@ "OS-EXT-SRV-ATTR:kernel_id": null, "OS-EXT-SRV-ATTR:ramdisk_id": null, "OS-EXT-SRV-ATTR:user_data": null, + "OS-EXT-STS:power_state": 1, + "OS-EXT-STS:task_state": null, + "OS-EXT-STS:vm_state": "active", + "os-extended-volumes:volumes_attached": [ + {"id": "volume_id1", "delete_on_termination": false}, + {"id": "volume_id2", "delete_on_termination": false} + ], + "OS-SRV-USG:launched_at": "%(strtime)s", + "OS-SRV-USG:terminated_at": null, + "security_groups": [ + { + "name": "default" + } + ], "locked": false, "accessIPv4": "%(access_ip_v4)s", "accessIPv6": "%(access_ip_v6)s", diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/v2.16/servers-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/servers-details-resp.json.tpl similarity index 65% rename from nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/v2.16/servers-detail-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/servers-details-resp.json.tpl index 8135a40582..3b2f46fc12 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-extended-server-attributes/v2.16/servers-detail-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/servers-details-resp.json.tpl @@ -1,31 +1,19 @@ { "servers": [ { - "OS-EXT-SRV-ATTR:host": "%(compute_host)s", - "OS-EXT-SRV-ATTR:hypervisor_hostname": "%(hypervisor_hostname)s", - "OS-EXT-SRV-ATTR:instance_name": "%(instance_name)s", - "OS-EXT-SRV-ATTR:hostname": "new-server-test", - "OS-EXT-SRV-ATTR:launch_index": 0, - "OS-EXT-SRV-ATTR:reservation_id": "%(reservation_id)s", - "OS-EXT-SRV-ATTR:root_device_name": "/dev/sda", - "OS-EXT-SRV-ATTR:kernel_id": null, - "OS-EXT-SRV-ATTR:ramdisk_id": null, - "OS-EXT-SRV-ATTR:user_data": null, - "locked": false, "accessIPv4": "%(access_ip_v4)s", "accessIPv6": "%(access_ip_v6)s", - "updated": "%(isotime)s", - "created": "%(isotime)s", "addresses": { "private": [ { "addr": "%(ip)s", - "version": 4, "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", - "OS-EXT-IPS:type": "fixed" + "OS-EXT-IPS:type": "fixed", + "version": 4 } ] }, + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -36,7 +24,7 @@ ] }, "hostId": "%(hostid)s", - "id": "%(uuid)s", + "id": "%(id)s", "image": { "id": "%(uuid)s", "links": [ @@ -46,9 +34,10 @@ } ] }, + "key_name": null, "links": [ { - "href": "%(versioned_compute_endpoint)s/servers/%(id)s", + "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", "rel": "self" }, { @@ -60,12 +49,40 @@ "My Server Name": "Apache1" }, "name": "new-server-test", + "config_drive": "", + "OS-DCF:diskConfig": "AUTO", + "OS-EXT-AZ:availability_zone": "nova", + "OS-EXT-SRV-ATTR:host": "%(compute_host)s", + "OS-EXT-SRV-ATTR:hypervisor_hostname": "%(hypervisor_hostname)s", + "OS-EXT-SRV-ATTR:instance_name": "%(instance_name)s", + "OS-EXT-SRV-ATTR:reservation_id": "%(reservation_id)s", + "OS-EXT-SRV-ATTR:launch_index": 0, + "OS-EXT-SRV-ATTR:kernel_id": "", + "OS-EXT-SRV-ATTR:ramdisk_id": "", + "OS-EXT-SRV-ATTR:hostname": "%(hostname)s", + "OS-EXT-SRV-ATTR:root_device_name": "/dev/sda", + "OS-EXT-SRV-ATTR:user_data": "", + "OS-EXT-STS:power_state": 1, + "OS-EXT-STS:task_state": null, + "OS-EXT-STS:vm_state": "active", + "os-extended-volumes:volumes_attached": [ + {"id": "volume_id1", "delete_on_termination": false}, + {"id": "volume_id2", "delete_on_termination": false} + ], + "OS-SRV-USG:launched_at": "%(strtime)s", + "OS-SRV-USG:terminated_at": null, "progress": 0, + "security_groups": [ + { + "name": "default" + } + ], "status": "ACTIVE", "host_status": "UP", "tenant_id": "6f70656e737461636b20342065766572", + "updated": "%(isotime)s", "user_id": "fake", - "key_name": null + "locked": false } ] } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/servers-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/servers-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_sample_tests/api_samples/os-access-ips/servers-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/servers-list-resp.json.tpl diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-action-rebuild-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-action-rebuild-resp.json.tpl index 73fedda938..ce724404b3 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-action-rebuild-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-action-rebuild-resp.json.tpl @@ -49,6 +49,7 @@ "name": "%(name)s", "description": "%(description)s", "progress": 0, + "OS-DCF:diskConfig": "AUTO", "status": "ACTIVE", "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-get-resp.json.tpl index f5f67cb635..939381ed97 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-get-resp.json.tpl @@ -65,7 +65,10 @@ "OS-EXT-STS:power_state": 1, "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", - "os-extended-volumes:volumes_attached": [], + "os-extended-volumes:volumes_attached": [ + {"id": "volume_id1", "delete_on_termination": false}, + {"id": "volume_id2", "delete_on_termination": false} + ], "OS-SRV-USG:launched_at": "%(strtime)s", "OS-SRV-USG:terminated_at": null, "progress": 0, diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/servers-details-resp.json.tpl index c0ab6c5e27..c14a32ec36 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/servers-details-resp.json.tpl @@ -66,7 +66,10 @@ "OS-EXT-STS:power_state": 1, "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", - "os-extended-volumes:volumes_attached": [], + "os-extended-volumes:volumes_attached": [ + {"id": "volume_id1", "delete_on_termination": false}, + {"id": "volume_id2", "delete_on_termination": false} + ], "OS-SRV-USG:launched_at": "%(strtime)s", "OS-SRV-USG:terminated_at": null, "progress": 0, diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/server-get-resp.json.tpl index 4453d864ef..ba03f39dd2 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/server-get-resp.json.tpl @@ -64,7 +64,10 @@ "OS-EXT-STS:power_state": 1, "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", - "os-extended-volumes:volumes_attached": [], + "os-extended-volumes:volumes_attached": [ + {"id": "volume_id1", "delete_on_termination": false}, + {"id": "volume_id2", "delete_on_termination": false} + ], "OS-SRV-USG:launched_at": "%(strtime)s", "OS-SRV-USG:terminated_at": null, "progress": 0, diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-details-resp.json.tpl index 8cfa57b31f..08a41e47c8 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-details-resp.json.tpl @@ -65,7 +65,10 @@ "OS-EXT-STS:power_state": 1, "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "active", - "os-extended-volumes:volumes_attached": [], + "os-extended-volumes:volumes_attached": [ + {"id": "volume_id1", "delete_on_termination": false}, + {"id": "volume_id2", "delete_on_termination": false} + ], "OS-SRV-USG:launched_at": "%(strtime)s", "OS-SRV-USG:terminated_at": null, "progress": 0, diff --git a/nova/tests/functional/api_sample_tests/test_access_ips.py b/nova/tests/functional/api_sample_tests/test_access_ips.py deleted file mode 100644 index 3feed7c387..0000000000 --- a/nova/tests/functional/api_sample_tests/test_access_ips.py +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 2012 Nebula, Inc. -# Copyright 2013 IBM Corp. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from nova.tests.functional.api_sample_tests import api_sample_base -from nova.tests.unit.image import fake - - -class AccessIPsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): - extension_name = 'os-access-ips' - - def _servers_post(self, subs): - response = self._do_post('servers', 'server-post-req', subs) - return self._verify_response('server-post-resp', subs, response, 202) - - def test_servers_post(self): - subs = { - 'image_id': fake.get_valid_image_id(), - 'compute_endpoint': self._get_compute_endpoint(), - 'access_ip_v4': '1.2.3.4', - 'access_ip_v6': 'fe80::' - } - self._servers_post(subs) - - def test_servers_get(self): - subs = { - 'image_id': fake.get_valid_image_id(), - 'compute_endpoint': self._get_compute_endpoint(), - 'access_ip_v4': '1.2.3.4', - 'access_ip_v6': 'fe80::' - } - uuid = self._servers_post(subs) - response = self._do_get('servers/%s' % uuid) - subs['hostid'] = '[a-f0-9]+' - subs['id'] = uuid - self._verify_response('server-get-resp', subs, response, 200) - - def test_servers_details(self): - subs = { - 'image_id': fake.get_valid_image_id(), - 'compute_endpoint': self._get_compute_endpoint(), - 'access_ip_v4': '1.2.3.4', - 'access_ip_v6': 'fe80::' - } - uuid = self._servers_post(subs) - response = self._do_get('servers/detail') - subs['hostid'] = '[a-f0-9]+' - subs['id'] = uuid - self._verify_response('servers-details-resp', subs, response, 200) diff --git a/nova/tests/functional/api_sample_tests/test_availability_zone.py b/nova/tests/functional/api_sample_tests/test_availability_zone.py index db157b6895..2cc5caa0e1 100644 --- a/nova/tests/functional/api_sample_tests/test_availability_zone.py +++ b/nova/tests/functional/api_sample_tests/test_availability_zone.py @@ -27,6 +27,3 @@ class AvailabilityZoneJsonTest(test_servers.ServersSampleBase): response = self._do_get('os-availability-zone/detail') self._verify_response('availability-zone-detail-resp', {}, response, 200) - - def test_availability_zone_post(self): - self._post_server() diff --git a/nova/tests/functional/api_sample_tests/test_config_drive.py b/nova/tests/functional/api_sample_tests/test_config_drive.py deleted file mode 100644 index 8daa281715..0000000000 --- a/nova/tests/functional/api_sample_tests/test_config_drive.py +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2012 Nebula, Inc. -# Copyright 2013 IBM Corp. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from nova.tests.functional.api_sample_tests import test_servers -from nova.tests.unit.api.openstack import fakes -from nova.tests.unit.image import fake - - -class ConfigDriveSampleJsonTest(test_servers.ServersSampleBase): - extension_name = 'os-config-drive' - - def setUp(self): - super(ConfigDriveSampleJsonTest, self).setUp() - fakes.stub_out_networking(self) - fake.stub_out_image_service(self) - - def test_config_drive_show(self): - uuid = self._post_server(use_common_server_api_samples=False) - response = self._do_get('servers/%s' % uuid) - subs = {} - subs['hostid'] = '[a-f0-9]+' - # config drive can be a string for True or empty value for False - subs['cdrive'] = '.*' - subs['access_ip_v4'] = '1.2.3.4' - subs['access_ip_v6'] = '80fe::' - self._verify_response('server-config-drive-get-resp', subs, - response, 200) - - def test_config_drive_detail(self): - self._post_server(use_common_server_api_samples=False) - response = self._do_get('servers/detail') - subs = {} - subs['hostid'] = '[a-f0-9]+' - # config drive can be a string for True or empty value for False - subs['cdrive'] = '.*' - subs['access_ip_v4'] = '1.2.3.4' - subs['access_ip_v6'] = '80fe::' - self._verify_response('servers-config-drive-details-resp', - subs, response, 200) diff --git a/nova/tests/functional/api_sample_tests/test_disk_config.py b/nova/tests/functional/api_sample_tests/test_disk_config.py deleted file mode 100644 index a4a0705d21..0000000000 --- a/nova/tests/functional/api_sample_tests/test_disk_config.py +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 2012 Nebula, Inc. -# Copyright 2013 IBM Corp. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from nova.tests.functional.api_sample_tests import test_servers - - -class DiskConfigJsonTest(test_servers.ServersSampleBase): - extension_name = 'os-disk-config' - extra_extensions_to_load = ["os-access-ips"] - - def test_list_servers_detail(self): - uuid = self._post_server(use_common_server_api_samples=False) - response = self._do_get('servers/detail') - subs = {} - 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) - - def test_get_server(self): - uuid = self._post_server(use_common_server_api_samples=False) - response = self._do_get('servers/%s' % uuid) - subs = {} - subs['hostid'] = '[a-f0-9]+' - subs['access_ip_v4'] = '' - subs['access_ip_v6'] = '' - self._verify_response('server-get-resp', subs, response, 200) diff --git a/nova/tests/functional/api_sample_tests/test_extended_server_attributes.py b/nova/tests/functional/api_sample_tests/test_extended_server_attributes.py deleted file mode 100644 index 164bf72604..0000000000 --- a/nova/tests/functional/api_sample_tests/test_extended_server_attributes.py +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 2012 Nebula, Inc. -# Copyright 2013 IBM Corp. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from nova.tests.functional.api_sample_tests import test_servers - - -class ExtendedServerAttributesJsonTest(test_servers.ServersSampleBase): - extension_name = "os-extended-server-attributes" - - def test_show(self): - uuid = self._post_server() - - response = self._do_get('servers/%s' % uuid) - subs = {} - subs['hostid'] = '[a-f0-9]+' - subs['id'] = uuid - subs['instance_name'] = 'instance-\d{8}' - subs['hypervisor_hostname'] = r'[\w\.\-]+' - subs['access_ip_v4'] = '1.2.3.4' - subs['access_ip_v6'] = '80fe::' - self._verify_response('server-get-resp', subs, response, 200) - - def test_detail(self): - uuid = self._post_server() - - response = self._do_get('servers/detail') - subs = {} - subs['hostid'] = '[a-f0-9]+' - subs['id'] = uuid - subs['instance_name'] = 'instance-\d{8}' - subs['hypervisor_hostname'] = r'[\w\.\-]+' - subs['access_ip_v4'] = '1.2.3.4' - subs['access_ip_v6'] = '80fe::' - self._verify_response('servers-detail-resp', subs, response, 200) - - -class ExtendedServerAttributesJsonTestV216(ExtendedServerAttributesJsonTest): - microversion = '2.16' - scenarios = [('v2_16', {'api_major_version': 'v2.1'})] - - def test_show(self): - uuid = self._post_server() - - response = self._do_get('servers/%s' % uuid) - subs = {} - subs['hostid'] = '[a-f0-9]+' - subs['id'] = uuid - subs['instance_name'] = 'instance-\d{8}' - subs['hypervisor_hostname'] = r'[\w\.\-]+' - subs['access_ip_v4'] = '1.2.3.4' - subs['access_ip_v6'] = '80fe::' - self._verify_response('server-get-resp', subs, response, 200) - - def test_detail(self): - uuid = self._post_server() - - response = self._do_get('servers/detail') - subs = {} - subs['hostid'] = '[a-f0-9]+' - subs['id'] = uuid - subs['instance_name'] = 'instance-\d{8}' - subs['hypervisor_hostname'] = r'[\w\.\-]+' - subs['access_ip_v4'] = '1.2.3.4' - subs['access_ip_v6'] = '80fe::' - self._verify_response('servers-detail-resp', subs, response, 200) diff --git a/nova/tests/functional/api_sample_tests/test_extended_volumes.py b/nova/tests/functional/api_sample_tests/test_extended_volumes.py deleted file mode 100644 index 275e199859..0000000000 --- a/nova/tests/functional/api_sample_tests/test_extended_volumes.py +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2012 Nebula, Inc. -# Copyright 2013 IBM Corp. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from nova.tests.functional.api_sample_tests import test_servers -from nova.tests.unit.api.openstack import fakes - - -class ExtendedVolumesSampleJsonTests(test_servers.ServersSampleBase): - extension_name = "os-extended-volumes" - - def test_show(self): - uuid = self._post_server() - self.stub_out('nova.db.block_device_mapping_get_all_by_instance_uuids', - fakes.stub_bdm_get_all_by_instance_uuids) - response = self._do_get('servers/%s' % uuid) - subs = {} - subs['hostid'] = '[a-f0-9]+' - subs['access_ip_v4'] = '1.2.3.4' - subs['access_ip_v6'] = '80fe::' - self._verify_response('server-get-resp', subs, response, 200) - - def test_detail(self): - uuid = self._post_server() - self.stub_out('nova.db.block_device_mapping_get_all_by_instance_uuids', - fakes.stub_bdm_get_all_by_instance_uuids) - response = self._do_get('servers/detail') - subs = {} - subs['id'] = uuid - subs['hostid'] = '[a-f0-9]+' - subs['access_ip_v4'] = '1.2.3.4' - subs['access_ip_v6'] = '80fe::' - self._verify_response('servers-detail-resp', subs, response, 200) diff --git a/nova/tests/functional/api_sample_tests/test_rescue.py b/nova/tests/functional/api_sample_tests/test_rescue.py index 5e046626ac..e905e386db 100644 --- a/nova/tests/functional/api_sample_tests/test_rescue.py +++ b/nova/tests/functional/api_sample_tests/test_rescue.py @@ -45,6 +45,9 @@ class RescueJsonTest(test_servers.ServersSampleBase): subs['status'] = 'RESCUE' subs['access_ip_v4'] = '1.2.3.4' subs['access_ip_v6'] = '80fe::' + subs['instance_name'] = 'instance-\d{8}' + subs['hypervisor_hostname'] = r'[\w\.\-]+' + subs['cdrive'] = '.*' self._verify_response('server-get-resp-rescue', subs, response, 200) def test_server_rescue_with_image_ref_specified(self): @@ -66,6 +69,9 @@ class RescueJsonTest(test_servers.ServersSampleBase): subs['status'] = 'RESCUE' subs['access_ip_v4'] = '1.2.3.4' subs['access_ip_v6'] = '80fe::' + subs['instance_name'] = 'instance-\d{8}' + subs['hypervisor_hostname'] = r'[\w\.\-]+' + subs['cdrive'] = '.*' self._verify_response('server-get-resp-rescue', subs, response, 200) def test_server_unrescue(self): @@ -82,4 +88,7 @@ class RescueJsonTest(test_servers.ServersSampleBase): subs['status'] = 'ACTIVE' subs['access_ip_v4'] = '1.2.3.4' subs['access_ip_v6'] = '80fe::' + subs['instance_name'] = 'instance-\d{8}' + subs['hypervisor_hostname'] = r'[\w\.\-]+' + subs['cdrive'] = '.*' self._verify_response('server-get-resp-unrescue', subs, response, 200) diff --git a/nova/tests/functional/api_sample_tests/test_server_tags.py b/nova/tests/functional/api_sample_tests/test_server_tags.py index 77ed3e1964..8f1b64c2ca 100644 --- a/nova/tests/functional/api_sample_tests/test_server_tags.py +++ b/nova/tests/functional/api_sample_tests/test_server_tags.py @@ -51,6 +51,10 @@ class ServerTagsJsonTest(test_servers.ServersSampleBase): subs['tag'] = '[0-9a-zA-Z]+' subs['access_ip_v4'] = '1.2.3.4' subs['access_ip_v6'] = '80fe::' + subs['hostname'] = r'[\w\.\-]+' + subs['instance_name'] = 'instance-\d{8}' + subs['hypervisor_hostname'] = r'[\w\.\-]+' + subs['cdrive'] = '.*' self._verify_response('server-tags-show-details-resp', subs, response, 200) @@ -62,6 +66,10 @@ class ServerTagsJsonTest(test_servers.ServersSampleBase): subs['tag'] = '[0-9a-zA-Z]+' subs['access_ip_v4'] = '1.2.3.4' subs['access_ip_v6'] = '80fe::' + subs['hostname'] = r'[\w\.\-]+' + subs['instance_name'] = 'instance-\d{8}' + subs['hypervisor_hostname'] = r'[\w\.\-]+' + subs['cdrive'] = '.*' self._verify_response('servers-tags-details-resp', subs, response, 200) def test_server_tags_index(self): diff --git a/nova/tests/functional/api_sample_tests/test_servers.py b/nova/tests/functional/api_sample_tests/test_servers.py index b1d73c1d09..bf499a1659 100644 --- a/nova/tests/functional/api_sample_tests/test_servers.py +++ b/nova/tests/functional/api_sample_tests/test_servers.py @@ -14,12 +14,13 @@ # under the License. from nova.tests.functional.api_sample_tests import api_sample_base +from nova.tests.unit.api.openstack import fakes from nova.tests.unit.image import fake class ServersSampleBase(api_sample_base.ApiSampleTestBaseV21): - extra_extensions_to_load = ["os-access-ips"] microversion = None + all_extensions = True def _post_server(self, use_common_server_api_samples=True): # param use_common_server_api_samples: Boolean to set whether tests use @@ -68,14 +69,12 @@ class ServersSampleJsonTest(ServersSampleBase): sample_dir = 'servers' microversion = None - # TODO(gmann): This will be removed once all API tests runs for - # all extension enable. - all_extensions = True - def test_servers_post(self): return self._post_server() def test_servers_get(self): + self.stub_out('nova.db.block_device_mapping_get_all_by_instance_uuids', + fakes.stub_bdm_get_all_by_instance_uuids) uuid = self.test_servers_post() response = self._do_get('servers/%s' % uuid) subs = {} @@ -87,6 +86,8 @@ class ServersSampleJsonTest(ServersSampleBase): subs['mac_addr'] = '(?:[a-f0-9]{2}:){5}[a-f0-9]{2}' subs['access_ip_v4'] = '1.2.3.4' subs['access_ip_v6'] = '80fe::' + # config drive can be a string for True or empty value for False + subs['cdrive'] = '.*' self._verify_response('server-get-resp', subs, response, 200) def test_servers_list(self): @@ -96,6 +97,8 @@ class ServersSampleJsonTest(ServersSampleBase): self._verify_response('servers-list-resp', subs, response, 200) def test_servers_details(self): + self.stub_out('nova.db.block_device_mapping_get_all_by_instance_uuids', + fakes.stub_bdm_get_all_by_instance_uuids) uuid = self.test_servers_post() response = self._do_get('servers/detail') subs = {} @@ -107,6 +110,8 @@ class ServersSampleJsonTest(ServersSampleBase): subs['mac_addr'] = '(?:[a-f0-9]{2}:){5}[a-f0-9]{2}' subs['access_ip_v4'] = '1.2.3.4' subs['access_ip_v6'] = '80fe::' + # config drive can be a string for True or empty value for False + subs['cdrive'] = '.*' self._verify_response('servers-details-resp', subs, response, 200) @@ -118,6 +123,11 @@ class ServersSampleJson29Test(ServersSampleJsonTest): scenarios = [('v2_9', {'api_major_version': 'v2.1'})] +class ServersSampleJson216Test(ServersSampleJsonTest): + microversion = '2.16' + scenarios = [('v2_16', {'api_major_version': 'v2.1'})] + + class ServersSampleJson219Test(ServersSampleJsonTest): microversion = '2.19' sample_dir = 'servers' @@ -142,10 +152,6 @@ class ServersSampleJson219Test(ServersSampleJsonTest): class ServersUpdateSampleJsonTest(ServersSampleBase): sample_dir = 'servers' - # TODO(gmann): This will be removed once all API tests runs for - # all extension enable. - all_extensions = True - def test_update_server(self): uuid = self._post_server() subs = {} @@ -170,10 +176,6 @@ class ServerSortKeysJsonTests(ServersSampleBase): class ServersActionsJsonTest(ServersSampleBase): sample_dir = 'servers' - # TODO(gmann): This will be removed once all API tests runs for - # all extension enable. - all_extensions = True - def _test_server_action(self, uuid, action, req_tpl, subs=None, resp_tpl=None, code=202): subs = subs or {} @@ -273,10 +275,6 @@ class ServersActionsJson219Test(ServersSampleBase): class ServerStartStopJsonTest(ServersSampleBase): sample_dir = 'servers' - # TODO(gmann): This will be removed once all API tests runs for - # all extension enable. - all_extensions = True - def _test_server_action(self, uuid, action, req_tpl): response = self._do_post('servers/%s/action' % uuid, req_tpl,