diff --git a/api-ref/source/servers.inc b/api-ref/source/servers.inc index 8ff39d53b3..719b8d1db7 100644 --- a/api-ref/source/servers.inc +++ b/api-ref/source/servers.inc @@ -353,7 +353,7 @@ Response **Example Create Server: JSON response** -.. literalinclude:: ../../doc/api_samples/all_extensions/server-create-resp.json +.. literalinclude:: ../../doc/api_samples/servers/server-create-resp.json :language: javascript @@ -448,7 +448,7 @@ Response **Example List Servers Detailed: JSON response** -.. literalinclude:: /../../doc/api_samples/all_extensions/servers-details-resp.json +.. literalinclude:: /../../doc/api_samples/servers/servers-details-resp.json :language: javascript @@ -528,7 +528,7 @@ Response **Example Show Server Details: JSON response** -.. literalinclude:: ../../doc/api_samples/all_extensions/server-get-resp.json +.. literalinclude:: ../../doc/api_samples/servers/server-get-resp.json :language: javascript Update Server diff --git a/doc/api_samples/all_extensions/server-create-req.json b/doc/api_samples/all_extensions/server-create-req.json deleted file mode 100644 index 439f9b97ac..0000000000 --- a/doc/api_samples/all_extensions/server-create-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/all_extensions/server-create-resp.json b/doc/api_samples/all_extensions/server-create-resp.json deleted file mode 100644 index 310507befd..0000000000 --- a/doc/api_samples/all_extensions/server-create-resp.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "server": { - "OS-DCF:diskConfig": "AUTO", - "adminPass": "zPnp2GseTqG4", - "id": "8195065c-fea4-4d57-b93f-5c5c63fe90e8", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/8195065c-fea4-4d57-b93f-5c5c63fe90e8", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/8195065c-fea4-4d57-b93f-5c5c63fe90e8", - "rel": "bookmark" - } - ], - "security_groups": [ - { - "name": "default" - } - ] - } -} diff --git a/doc/api_samples/all_extensions/server-get-resp.json b/doc/api_samples/all_extensions/server-get-resp.json deleted file mode 100644 index 66c980b495..0000000000 --- a/doc/api_samples/all_extensions/server-get-resp.json +++ /dev/null @@ -1,74 +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-23T13:37:00Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "9cc36101a27c2a69c1a18241f6228454d9d7f466bd90c62db8e8b856", - "id": "f474386b-4fb6-4e1f-b1d5-d6bf4437f7d5", - "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/f474386b-4fb6-4e1f-b1d5-d6bf4437f7d5", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/f474386b-4fb6-4e1f-b1d5-d6bf4437f7d5", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "accessIPv4": "", - "accessIPv6": "", - "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" - } - ], - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2013-10-31T07:31:30Z", - "user_id": "fake" - } -} diff --git a/doc/api_samples/all_extensions/servers-details-resp.json b/doc/api_samples/all_extensions/servers-details-resp.json deleted file mode 100644 index 9b87d0e5b8..0000000000 --- a/doc/api_samples/all_extensions/servers-details-resp.json +++ /dev/null @@ -1,76 +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-23T13:53:12Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "f1e160ad2bf07084f3d3e0dfdd0795d80da18a60825322c15775c0dd", - "id": "9cbefc35-d372-40c5-88e2-9fda1b6ea12c", - "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/9cbefc35-d372-40c5-88e2-9fda1b6ea12c", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/9cbefc35-d372-40c5-88e2-9fda1b6ea12c", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "accessIPv4": "", - "accessIPv6": "", - "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-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" - } - ], - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2013-10-31T06:32:32Z", - "user_id": "fake" - } - ] -} diff --git a/doc/api_samples/all_extensions/servers-list-resp.json b/doc/api_samples/all_extensions/servers-list-resp.json deleted file mode 100644 index b6fa7e8d98..0000000000 --- a/doc/api_samples/all_extensions/servers-list-resp.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "servers": [ - { - "id": "a291599e-6de2-41a6-88df-c443ddcef70d", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/a291599e-6de2-41a6-88df-c443ddcef70d", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/a291599e-6de2-41a6-88df-c443ddcef70d", - "rel": "bookmark" - } - ], - "name": "new-server-test" - } - ] -} \ No newline at end of file diff --git a/doc/api_samples/os-extended-availability-zone/server-get-resp.json b/doc/api_samples/os-extended-availability-zone/server-get-resp.json deleted file mode 100644 index 01bcc70f9d..0000000000 --- a/doc/api_samples/os-extended-availability-zone/server-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-16T02:54:56Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "b75d6736650f9b272223ceb48f4cde001de1856e381613a922117ab7", - "id": "f22e4521-d03a-4e9f-9fd3-016b9e227219", - "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/f22e4521-d03a-4e9f-9fd3-016b9e227219", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/f22e4521-d03a-4e9f-9fd3-016b9e227219", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "OS-EXT-AZ:availability_zone": "nova", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2013-09-16T02:54:57Z", - "user_id": "fake" - } -} diff --git a/doc/api_samples/os-extended-availability-zone/servers-detail-resp.json b/doc/api_samples/os-extended-availability-zone/servers-detail-resp.json deleted file mode 100644 index 1d8b976333..0000000000 --- a/doc/api_samples/os-extended-availability-zone/servers-detail-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-16T02:54:56Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "cf5540800371e53064a60b36ff9d6d1d6a8719ffc870c63a270c6bee", - "id": "55f43fa2-dc7c-4c0b-b21a-76f9abe516f9", - "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/55f43fa2-dc7c-4c0b-b21a-76f9abe516f9", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/55f43fa2-dc7c-4c0b-b21a-76f9abe516f9", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "OS-EXT-AZ:availability_zone": "nova", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2013-09-16T02:54:58Z", - "user_id": "fake" - } - ] -} diff --git a/doc/api_samples/os-extended-status/server-get-resp.json b/doc/api_samples/os-extended-status/server-get-resp.json deleted file mode 100644 index b75fd3ff23..0000000000 --- a/doc/api_samples/os-extended-status/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-16T03:07:06Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "46d2aa2d637bd55606304b611a1928627ee1278c149aef2206268d6e", - "id": "a868cb5e-c794-47bf-9cd8-e302b72bb94b", - "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/a868cb5e-c794-47bf-9cd8-e302b72bb94b", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/a868cb5e-c794-47bf-9cd8-e302b72bb94b", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "OS-EXT-STS:power_state": 1, - "OS-EXT-STS:task_state": null, - "OS-EXT-STS:vm_state": "active", - "accessIPv4": "1.2.3.4", - "accessIPv6": "80fe::", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2013-09-16T03:07:07Z", - "user_id": "fake" - } -} diff --git a/doc/api_samples/os-extended-status/servers-detail-resp.json b/doc/api_samples/os-extended-status/servers-detail-resp.json deleted file mode 100644 index 14d9520dae..0000000000 --- a/doc/api_samples/os-extended-status/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-16T03:07:09Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "a275e77473e464558c4aba0d68e1914d1164e7ee2f69affde7aaae2b", - "id": "6c8b5385-e74c-4fd5-add6-2fcf42d74a98", - "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/6c8b5385-e74c-4fd5-add6-2fcf42d74a98", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/6c8b5385-e74c-4fd5-add6-2fcf42d74a98", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "OS-EXT-STS:power_state": 1, - "OS-EXT-STS:task_state": null, - "OS-EXT-STS:vm_state": "active", - "accessIPv4": "1.2.3.4", - "accessIPv6": "80fe::", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2013-09-16T03:07:10Z", - "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 0b913ac7d8..877295cd29 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 @@ -39,7 +39,24 @@ "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": "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" + } + ], "status": "ACTIVE", "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-24T14:39:01Z", 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 645704f377..766bb7b073 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 @@ -40,7 +40,24 @@ "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": "c3f14e9812ad496baf92ccfb3c61e15f", + "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:53:12.774549", + "OS-SRV-USG:terminated_at": null, "progress": 0, + "security_groups": [ + { + "name": "default" + } + ], "status": "ACTIVE", "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-24T14:44:01Z", diff --git a/doc/api_samples/os-security-groups/server-get-resp.json b/doc/api_samples/os-security-groups/server-get-resp.json deleted file mode 100644 index 74734e9a52..0000000000 --- a/doc/api_samples/os-security-groups/server-get-resp.json +++ /dev/null @@ -1,62 +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": "2014-09-18T10:13:33Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "24451d49cba30e60300a5b928ebc93a2d0b43c084a677b0a14fd678b", - "id": "b08eb8d8-db43-44fb-bd89-dfe3302b84ef", - "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/b08eb8d8-db43-44fb-bd89-dfe3302b84ef", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/b08eb8d8-db43-44fb-bd89-dfe3302b84ef", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "progress": 0, - "security_groups": [ - { - "name": "test" - } - ], - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2014-09-18T10:13:34Z", - "user_id": "fake" - } -} 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 b276c8211e..ea8b3db52a 100644 --- a/doc/api_samples/os-security-groups/server-post-resp.json +++ b/doc/api_samples/os-security-groups/server-post-resp.json @@ -1,21 +1,17 @@ { "server": { - "adminPass": "xhS2khTdkRkT", - "id": "60874907-c72b-4a01-805d-54c992510e47", + "adminPass": "6NpUwoz2QDRN", + "id": "f5dc173b-6804-445a-a6d8-c705dad5b5eb", "links": [ { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/60874907-c72b-4a01-805d-54c992510e47", + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", "rel": "self" }, { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/60874907-c72b-4a01-805d-54c992510e47", + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", "rel": "bookmark" } ], - "security_groups": [ - { - "name": "test" - } - ] + "security_groups": [{"name": "test"}] } -} \ No newline at end of file +} diff --git a/doc/api_samples/os-security-groups/servers-detail-resp.json b/doc/api_samples/os-security-groups/servers-detail-resp.json deleted file mode 100644 index 71b75c82c8..0000000000 --- a/doc/api_samples/os-security-groups/servers-detail-resp.json +++ /dev/null @@ -1,64 +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": "2014-09-18T10:13:33Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "2ab794bccd321fe64f9f8b679266aa2c96825f467434bbdd71b09b1d", - "id": "d182742c-6f20-479c-8e32-f79f9c9df6e3", - "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/d182742c-6f20-479c-8e32-f79f9c9df6e3", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/d182742c-6f20-479c-8e32-f79f9c9df6e3", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "progress": 0, - "security_groups": [ - { - "name": "test" - } - ], - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2014-09-18T10:13:34Z", - "user_id": "fake" - } - ] -} diff --git a/doc/api_samples/os-server-usage/server-get-resp.json b/doc/api_samples/os-server-usage/server-get-resp.json deleted file mode 100644 index 57ccf0c1d0..0000000000 --- a/doc/api_samples/os-server-usage/server-get-resp.json +++ /dev/null @@ -1,59 +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-08-15T08:12:40Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "73cf3a40601b63f5992894be2daa3712dd599d1c919984951e21edda", - "id": "cee6d136-e378-4cfc-9eec-71797f025991", - "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/cee6d136-e378-4cfc-9eec-71797f025991", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/cee6d136-e378-4cfc-9eec-71797f025991", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "OS-SRV-USG:launched_at": "2013-08-15T08:12:40.108903", - "OS-SRV-USG:terminated_at": null, - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2013-08-15T08:12:40Z", - "user_id": "fake" - } -} diff --git a/doc/api_samples/os-server-usage/servers-detail-resp.json b/doc/api_samples/os-server-usage/servers-detail-resp.json deleted file mode 100644 index a57d5ed01b..0000000000 --- a/doc/api_samples/os-server-usage/servers-detail-resp.json +++ /dev/null @@ -1,61 +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-08-15T12:04:04Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "117535ce0eda7ee02ebffe2c976173629385481ae3f2bded5e14a66b", - "id": "ae114799-9164-48f5-a036-6ef9310acbc4", - "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/ae114799-9164-48f5-a036-6ef9310acbc4", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/ae114799-9164-48f5-a036-6ef9310acbc4", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "OS-SRV-USG:launched_at": "2013-08-15T12:04:05.368766", - "OS-SRV-USG:terminated_at": null, - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2013-08-15T12:04:05Z", - "user_id": "fake" - } - ] -} diff --git a/doc/api_samples/servers/server-create-req.json b/doc/api_samples/servers/server-create-req.json index 220575075f..91b24bb441 100644 --- a/doc/api_samples/servers/server-create-req.json +++ b/doc/api_samples/servers/server-create-req.json @@ -13,6 +13,11 @@ "path": "/etc/banner.txt", "contents": "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 b25zLiINCg0KLVJpY2hhcmQgQmFjaA==" } + ], + "security_groups": [ + { + "name": "default" + } ] } } diff --git a/doc/api_samples/servers/server-get-resp.json b/doc/api_samples/servers/server-get-resp.json index af6297d972..64a954c762 100644 --- a/doc/api_samples/servers/server-get-resp.json +++ b/doc/api_samples/servers/server-get-resp.json @@ -48,7 +48,24 @@ "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": "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" + } + ], "status": "ACTIVE", "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-03T04:01:33Z", diff --git a/doc/api_samples/servers/servers-details-resp.json b/doc/api_samples/servers/servers-details-resp.json index bb374b9417..1c877c5df6 100644 --- a/doc/api_samples/servers/servers-details-resp.json +++ b/doc/api_samples/servers/servers-details-resp.json @@ -49,7 +49,24 @@ "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": "c3f14e9812ad496baf92ccfb3c61e15f", + "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:53:12.774549", + "OS-SRV-USG:terminated_at": null, "progress": 0, + "security_groups": [ + { + "name": "default" + } + ], "status": "ACTIVE", "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-03T04:01:32Z", 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 7ff8aaeba0..e5ec3a3161 100644 --- a/doc/api_samples/servers/v2.19/server-get-resp.json +++ b/doc/api_samples/servers/v2.19/server-get-resp.json @@ -50,7 +50,32 @@ "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": "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", "status": "ACTIVE", "tenant_id": "6f70656e737461636b20342065766572", "updated": "2015-12-07T17:24:15Z", diff --git a/doc/api_samples/servers/v2.19/server-post-resp.json b/doc/api_samples/servers/v2.19/server-post-resp.json index c5b9bc685e..ff1c136f25 100644 --- a/doc/api_samples/servers/v2.19/server-post-resp.json +++ b/doc/api_samples/servers/v2.19/server-post-resp.json @@ -1,6 +1,7 @@ { "server": { "adminPass": "rySfUy7xL4C5", + "OS-DCF:diskConfig": "AUTO", "id": "19923676-e78b-46fb-af62-a5942aece2ac", "links": [ { @@ -11,6 +12,11 @@ "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/19923676-e78b-46fb-af62-a5942aece2ac", "rel": "bookmark" } + ], + "security_groups": [ + { + "name": "default" + } ] } } \ No newline at end of file diff --git a/doc/api_samples/servers/v2.19/server-put-resp.json b/doc/api_samples/servers/v2.19/server-put-resp.json index 91c2f3cd08..29c8f6ac9b 100644 --- a/doc/api_samples/servers/v2.19/server-put-resp.json +++ b/doc/api_samples/servers/v2.19/server-put-resp.json @@ -2,6 +2,7 @@ "server": { "accessIPv4": "1.2.3.4", "accessIPv6": "80fe::", + "OS-DCF:diskConfig": "AUTO", "addresses": { "private": [ { 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 18dc0d6530..f42cdc0425 100644 --- a/doc/api_samples/servers/v2.19/servers-details-resp.json +++ b/doc/api_samples/servers/v2.19/servers-details-resp.json @@ -51,7 +51,32 @@ "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": "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", "status": "ACTIVE", "tenant_id": "6f70656e737461636b20342065766572", "updated": "2015-12-07T19:54:49Z", 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 cbd4336469..6dc32bc840 100644 --- a/doc/api_samples/servers/v2.9/server-get-resp.json +++ b/doc/api_samples/servers/v2.9/server-get-resp.json @@ -48,7 +48,31 @@ "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": "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" + } + ], "status": "ACTIVE", "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-03T04:01:33Z", 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 44bfad504d..4136eb0d7c 100644 --- a/doc/api_samples/servers/v2.9/servers-details-resp.json +++ b/doc/api_samples/servers/v2.9/servers-details-resp.json @@ -49,7 +49,31 @@ "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": "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" + } + ], "status": "ACTIVE", "tenant_id": "6f70656e737461636b20342065766572", "updated": "2013-09-03T04:01:32Z", diff --git a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-create-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-create-req.json.tpl deleted file mode 100644 index 0562dcb136..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-create-req.json.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{ - "server" : { - "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/all_extensions/server-create-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-create-resp.json.tpl deleted file mode 100644 index 4b30e0cfbd..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-create-resp.json.tpl +++ /dev/null @@ -1,22 +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" - } - ], - "security_groups": [ - { - "name": "default" - } - ] - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-get-resp.json.tpl deleted file mode 100644 index e261f4a95f..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-get-resp.json.tpl +++ /dev/null @@ -1,74 +0,0 @@ -{ - "server": { - "accessIPv4": "", - "accessIPv6": "", - "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" - } - ] - }, - "key_name": null, - "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", - "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-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": "%(strtime)s", - "OS-SRV-USG:terminated_at": null, - "progress": 0, - "security_groups": [ - { - "name": "default" - } - ], - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "%(isotime)s", - "user_id": "fake" - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/servers-details-resp.json.tpl deleted file mode 100644 index 6dddb52cac..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/servers-details-resp.json.tpl +++ /dev/null @@ -1,76 +0,0 @@ -{ - "servers": [ - { - "accessIPv4": "", - "accessIPv6": "", - "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" - } - ] - }, - "key_name": null, - "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", - "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-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": "%(strtime)s", - "OS-SRV-USG:terminated_at": null, - "progress": 0, - "security_groups": [ - { - "name": "default" - } - ], - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "%(isotime)s", - "user_id": "fake" - } - ] -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/servers-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/servers-list-resp.json.tpl deleted file mode 100644 index 586668759f..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/servers-list-resp.json.tpl +++ /dev/null @@ -1,18 +0,0 @@ -{ - "servers": [ - { - "id": "%(uuid)s", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/servers/%(uuid)s", - "rel": "bookmark" - } - ], - "name": "new-server-test" - } - ] -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/extension-info/extensions-list-resp-v21-compatible.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/extension-info/extensions-list-resp-v21-compatible.json.tpl new file mode 100644 index 0000000000..e1da6a0a09 --- /dev/null +++ b/nova/tests/functional/api_sample_tests/api_samples/extension-info/extensions-list-resp-v21-compatible.json.tpl @@ -0,0 +1,804 @@ +{ + "extensions": [ + { + "alias": "NMN", + "description": "Multiple network support.", + "links": [], + "name": "Multinic", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-DCF", + "description": "Disk Management Extension.", + "links": [], + "name": "DiskConfig", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-EXT-AZ", + "description": "Extended Availability Zone support.", + "links": [], + "name": "ExtendedAvailabilityZone", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-EXT-IMG-SIZE", + "description": "Adds image size to image listings.", + "links": [], + "name": "ImageSize", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-EXT-IPS", + "description": "", + "links": [], + "name": "ExtendedIps", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-EXT-IPS-MAC", + "description": "", + "links": [], + "name": "ExtendedIpsMac", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-EXT-SRV-ATTR", + "description": "Extended Server Attributes support.", + "links": [], + "name": "ExtendedServerAttributes", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-EXT-STS", + "description": "", + "links": [], + "name": "ExtendedStatus", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-EXT-VIF-NET", + "description": "", + "links": [], + "name": "ExtendedVIFNet", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-FLV-DISABLED", + "description": "", + "links": [], + "name": "FlavorDisabled", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-FLV-EXT-DATA", + "description": "", + "links": [], + "name": "FlavorExtraData", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-SCH-HNT", + "description": "Pass arbitrary key/value pairs to the scheduler.", + "links": [], + "name": "SchedulerHints", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-SRV-USG", + "description": "Adds launched_at and terminated_at on Servers.", + "links": [], + "name": "ServerUsage", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-access-ips", + "description": "Access IPs support.", + "links": [], + "name": "AccessIPs", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-admin-actions", + "description": "Enable admin-only server actions\n\n Actions include: resetNetwork, injectNetworkInfo, os-resetState\n ", + "links": [], + "name": "AdminActions", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-admin-password", + "description": "Admin password management support.", + "links": [], + "name": "AdminPassword", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-agents", + "description": "Agents support.", + "links": [], + "name": "Agents", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-aggregates", + "description": "Admin-only aggregate administration.", + "links": [], + "name": "Aggregates", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-assisted-volume-snapshots", + "description": "Assisted volume snapshots.", + "links": [], + "name": "AssistedVolumeSnapshots", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-attach-interfaces", + "description": "Attach interface support.", + "links": [], + "name": "AttachInterfaces", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-availability-zone", + "description": "1. Add availability_zone to the Create Server API.\n 2. Add availability zones describing.\n ", + "links": [], + "name": "AvailabilityZone", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-baremetal-ext-status", + "description": "", + "links": [], + "name": "BareMetalExtStatus", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-baremetal-nodes", + "description": "Admin-only bare-metal node administration.", + "links": [], + "name": "BareMetalNodes", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-block-device-mapping", + "description": "Block device mapping boot support.", + "links": [], + "name": "BlockDeviceMapping", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-block-device-mapping-v2-boot", + "description": "", + "links": [], + "name": "BlockDeviceMappingV2Boot", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-cell-capacities", + "description": "", + "links": [], + "name": "CellCapacities", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-cells", + "description": "Enables cells-related functionality such as adding neighbor cells,\n listing neighbor cells, and getting the capabilities of the local cell.\n ", + "links": [], + "name": "Cells", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-certificates", + "description": "Certificates support.", + "links": [], + "name": "Certificates", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-cloudpipe", + "description": "Adds actions to create cloudpipe instances.\n\n When running with the Vlan network mode, you need a mechanism to route\n from the public Internet to your vlans. This mechanism is known as a\n cloudpipe.\n\n At the time of creating this class, only OpenVPN is supported. Support for\n a SSH Bastion host is forthcoming.\n ", + "links": [], + "name": "Cloudpipe", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-cloudpipe-update", + "description": "", + "links": [], + "name": "CloudpipeUpdate", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-config-drive", + "description": "Config Drive Extension.", + "links": [], + "name": "ConfigDrive", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-console-auth-tokens", + "description": "Console token authentication support.", + "links": [], + "name": "ConsoleAuthTokens", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-console-output", + "description": "Console log output support, with tailing ability.", + "links": [], + "name": "ConsoleOutput", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-consoles", + "description": "Interactive Console support.", + "links": [], + "name": "Consoles", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-create-backup", + "description": "Create a backup of a server.", + "links": [], + "name": "CreateBackup", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-create-server-ext", + "description": "", + "links": [], + "name": "Createserverext", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-deferred-delete", + "description": "Instance deferred delete.", + "links": [], + "name": "DeferredDelete", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-evacuate", + "description": "Enables server evacuation.", + "links": [], + "name": "Evacuate", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-evacuate-find-host", + "description": "", + "links": [], + "name": "ExtendedEvacuateFindHost", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-floating-ips", + "description": "", + "links": [], + "name": "ExtendedFloatingIps", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-hypervisors", + "description": "", + "links": [], + "name": "ExtendedHypervisors", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-networks", + "description": "", + "links": [], + "name": "ExtendedNetworks", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-quotas", + "description": "", + "links": [], + "name": "ExtendedQuotas", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-rescue-with-image", + "description": "", + "links": [], + "name": "ExtendedRescueWithImage", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-services", + "description": "", + "links": [], + "name": "ExtendedServices", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-services-delete", + "description": "", + "links": [], + "name": "ExtendedServicesDelete", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-status", + "description": "Extended Status support.", + "links": [], + "name": "ExtendedStatus", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-volumes", + "description": "Extended Volumes support.", + "links": [], + "name": "ExtendedVolumes", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-fixed-ips", + "description": "Fixed IPs support.", + "links": [], + "name": "FixedIPs", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-flavor-access", + "description": "Flavor access support.", + "links": [], + "name": "FlavorAccess", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-flavor-extra-specs", + "description": "Flavors extra specs support.", + "links": [], + "name": "FlavorExtraSpecs", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-flavor-manage", + "description": "Flavor create/delete API support.", + "links": [], + "name": "FlavorManage", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-flavor-rxtx", + "description": "Support to show the rxtx status of a flavor.", + "links": [], + "name": "FlavorRxtx", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-flavor-swap", + "description": "", + "links": [], + "name": "FlavorSwap", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-floating-ip-dns", + "description": "Floating IP DNS support.", + "links": [], + "name": "FloatingIpDns", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-floating-ip-pools", + "description": "Floating IPs support.", + "links": [], + "name": "FloatingIpPools", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-floating-ips", + "description": "Floating IPs support.", + "links": [], + "name": "FloatingIps", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-floating-ips-bulk", + "description": "Bulk handling of Floating IPs.", + "links": [], + "name": "FloatingIpsBulk", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-fping", + "description": "Fping Management Extension.", + "links": [], + "name": "Fping", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-hide-server-addresses", + "description": "Support hiding server addresses in certain states.", + "links": [], + "name": "HideServerAddresses", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-hosts", + "description": "Admin-only host administration.", + "links": [], + "name": "Hosts", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-hypervisor-status", + "description": "", + "links": [], + "name": "HypervisorStatus", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-hypervisors", + "description": "Admin-only hypervisor administration.", + "links": [], + "name": "Hypervisors", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-instance-actions", + "description": "View a log of actions and events taken on an instance.", + "links": [], + "name": "InstanceActions", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-instance_usage_audit_log", + "description": "Admin-only Task Log Monitoring.", + "links": [], + "name": "OSInstanceUsageAuditLog", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-keypairs", + "description": "Keypair Support.", + "links": [], + "name": "Keypairs", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-lock-server", + "description": "Enable lock/unlock server actions.", + "links": [], + "name": "LockServer", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-migrate-server", + "description": "Enable migrate and live-migrate server actions.", + "links": [], + "name": "MigrateServer", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-migrations", + "description": "Provide data on migrations.", + "links": [], + "name": "Migrations", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-multiple-create", + "description": "Allow multiple create in the Create Server v2.1 API.", + "links": [], + "name": "MultipleCreate", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-networks", + "description": "Admin-only Network Management Extension.", + "links": [], + "name": "Networks", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-networks-associate", + "description": "Network association support.", + "links": [], + "name": "NetworkAssociationSupport", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-pause-server", + "description": "Enable pause/unpause server actions.", + "links": [], + "name": "PauseServer", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-personality", + "description": "Personality support.", + "links": [], + "name": "Personality", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-preserve-ephemeral-rebuild", + "description": "Allow preservation of the ephemeral partition on rebuild.", + "links": [], + "name": "PreserveEphemeralOnRebuild", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-quota-class-sets", + "description": "Quota classes management support.", + "links": [], + "name": "QuotaClasses", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-quota-sets", + "description": "Quotas management support.", + "links": [], + "name": "Quotas", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-rescue", + "description": "Instance rescue mode.", + "links": [], + "name": "Rescue", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-security-group-default-rules", + "description": "Default rules for security group support.", + "links": [], + "name": "SecurityGroupDefaultRules", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-security-groups", + "description": "Security group support.", + "links": [], + "name": "SecurityGroups", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-diagnostics", + "description": "Allow Admins to view server diagnostics through server action.", + "links": [], + "name": "ServerDiagnostics", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-external-events", + "description": "Server External Event Triggers.", + "links": [], + "name": "ServerExternalEvents", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-group-quotas", + "description": "", + "links": [], + "name": "ServerGroupQuotas", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-groups", + "description": "Server group support.", + "links": [], + "name": "ServerGroups", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-list-multi-status", + "description": "", + "links": [], + "name": "ServerListMultiStatus", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-password", + "description": "Server password support.", + "links": [], + "name": "ServerPassword", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-sort-keys", + "description": "", + "links": [], + "name": "ServerSortKeys", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-start-stop", + "description": "", + "links": [], + "name": "ServerStartStop", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-services", + "description": "Services support.", + "links": [], + "name": "Services", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-shelve", + "description": "Instance shelve mode.", + "links": [], + "name": "Shelve", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-simple-tenant-usage", + "description": "Simple tenant usage extension.", + "links": [], + "name": "SimpleTenantUsage", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-suspend-server", + "description": "Enable suspend/resume server actions.", + "links": [], + "name": "SuspendServer", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-tenant-networks", + "description": "Tenant-based Network Management Extension.", + "links": [], + "name": "OSTenantNetworks", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-used-limits", + "description": "Provide data on limited resources that are being used.", + "links": [], + "name": "UsedLimits", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-used-limits-for-admin", + "description": "", + "links": [], + "name": "UsedLimitsForAdmin", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-user-data", + "description": "Add user_data to the Create Server API.", + "links": [], + "name": "UserData", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-user-quotas", + "description": "", + "links": [], + "name": "UserQuotas", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-virtual-interfaces", + "description": "Virtual interface support.", + "links": [], + "name": "VirtualInterfaces", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-volume-attachment-update", + "description": "", + "links": [], + "name": "VolumeAttachmentUpdate", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-volumes", + "description": "Volumes support.", + "links": [], + "name": "Volumes", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + } + ] +} \ No newline at end of file diff --git a/nova/tests/functional/api_sample_tests/api_samples/extension-info/extensions-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/extension-info/extensions-list-resp.json.tpl new file mode 100644 index 0000000000..751260d89f --- /dev/null +++ b/nova/tests/functional/api_sample_tests/api_samples/extension-info/extensions-list-resp.json.tpl @@ -0,0 +1,796 @@ +{ + "extensions": [ + { + "alias": "NMN", + "description": "Multiple network support.", + "links": [], + "name": "Multinic", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-DCF", + "description": "Disk Management Extension.", + "links": [], + "name": "DiskConfig", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-EXT-AZ", + "description": "Extended Availability Zone support.", + "links": [], + "name": "ExtendedAvailabilityZone", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-EXT-IMG-SIZE", + "description": "Adds image size to image listings.", + "links": [], + "name": "ImageSize", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-EXT-IPS", + "description": "", + "links": [], + "name": "ExtendedIps", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-EXT-IPS-MAC", + "description": "", + "links": [], + "name": "ExtendedIpsMac", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-EXT-SRV-ATTR", + "description": "Extended Server Attributes support.", + "links": [], + "name": "ExtendedServerAttributes", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-EXT-STS", + "description": "", + "links": [], + "name": "ExtendedStatus", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-FLV-DISABLED", + "description": "", + "links": [], + "name": "FlavorDisabled", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-FLV-EXT-DATA", + "description": "", + "links": [], + "name": "FlavorExtraData", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-SCH-HNT", + "description": "Pass arbitrary key/value pairs to the scheduler.", + "links": [], + "name": "SchedulerHints", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-SRV-USG", + "description": "Adds launched_at and terminated_at on Servers.", + "links": [], + "name": "ServerUsage", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-access-ips", + "description": "Access IPs support.", + "links": [], + "name": "AccessIPs", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-admin-actions", + "description": "Enable admin-only server actions\n\n Actions include: resetNetwork, injectNetworkInfo, os-resetState\n ", + "links": [], + "name": "AdminActions", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-admin-password", + "description": "Admin password management support.", + "links": [], + "name": "AdminPassword", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-agents", + "description": "Agents support.", + "links": [], + "name": "Agents", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-aggregates", + "description": "Admin-only aggregate administration.", + "links": [], + "name": "Aggregates", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-assisted-volume-snapshots", + "description": "Assisted volume snapshots.", + "links": [], + "name": "AssistedVolumeSnapshots", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-attach-interfaces", + "description": "Attach interface support.", + "links": [], + "name": "AttachInterfaces", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-availability-zone", + "description": "1. Add availability_zone to the Create Server API.\n 2. Add availability zones describing.\n ", + "links": [], + "name": "AvailabilityZone", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-baremetal-ext-status", + "description": "", + "links": [], + "name": "BareMetalExtStatus", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-baremetal-nodes", + "description": "Admin-only bare-metal node administration.", + "links": [], + "name": "BareMetalNodes", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-block-device-mapping", + "description": "Block device mapping boot support.", + "links": [], + "name": "BlockDeviceMapping", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-block-device-mapping-v2-boot", + "description": "", + "links": [], + "name": "BlockDeviceMappingV2Boot", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-cell-capacities", + "description": "", + "links": [], + "name": "CellCapacities", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-cells", + "description": "Enables cells-related functionality such as adding neighbor cells,\n listing neighbor cells, and getting the capabilities of the local cell.\n ", + "links": [], + "name": "Cells", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-certificates", + "description": "Certificates support.", + "links": [], + "name": "Certificates", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-cloudpipe", + "description": "Adds actions to create cloudpipe instances.\n\n When running with the Vlan network mode, you need a mechanism to route\n from the public Internet to your vlans. This mechanism is known as a\n cloudpipe.\n\n At the time of creating this class, only OpenVPN is supported. Support for\n a SSH Bastion host is forthcoming.\n ", + "links": [], + "name": "Cloudpipe", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-cloudpipe-update", + "description": "", + "links": [], + "name": "CloudpipeUpdate", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-config-drive", + "description": "Config Drive Extension.", + "links": [], + "name": "ConfigDrive", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-console-auth-tokens", + "description": "Console token authentication support.", + "links": [], + "name": "ConsoleAuthTokens", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-console-output", + "description": "Console log output support, with tailing ability.", + "links": [], + "name": "ConsoleOutput", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-consoles", + "description": "Interactive Console support.", + "links": [], + "name": "Consoles", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-create-backup", + "description": "Create a backup of a server.", + "links": [], + "name": "CreateBackup", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-create-server-ext", + "description": "", + "links": [], + "name": "Createserverext", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-deferred-delete", + "description": "Instance deferred delete.", + "links": [], + "name": "DeferredDelete", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-evacuate", + "description": "Enables server evacuation.", + "links": [], + "name": "Evacuate", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-evacuate-find-host", + "description": "", + "links": [], + "name": "ExtendedEvacuateFindHost", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-floating-ips", + "description": "", + "links": [], + "name": "ExtendedFloatingIps", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-hypervisors", + "description": "", + "links": [], + "name": "ExtendedHypervisors", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-networks", + "description": "", + "links": [], + "name": "ExtendedNetworks", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-quotas", + "description": "", + "links": [], + "name": "ExtendedQuotas", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-rescue-with-image", + "description": "", + "links": [], + "name": "ExtendedRescueWithImage", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-services", + "description": "", + "links": [], + "name": "ExtendedServices", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-services-delete", + "description": "", + "links": [], + "name": "ExtendedServicesDelete", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-status", + "description": "Extended Status support.", + "links": [], + "name": "ExtendedStatus", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-volumes", + "description": "Extended Volumes support.", + "links": [], + "name": "ExtendedVolumes", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-fixed-ips", + "description": "Fixed IPs support.", + "links": [], + "name": "FixedIPs", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-flavor-access", + "description": "Flavor access support.", + "links": [], + "name": "FlavorAccess", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-flavor-extra-specs", + "description": "Flavors extra specs support.", + "links": [], + "name": "FlavorExtraSpecs", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-flavor-manage", + "description": "Flavor create/delete API support.", + "links": [], + "name": "FlavorManage", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-flavor-rxtx", + "description": "Support to show the rxtx status of a flavor.", + "links": [], + "name": "FlavorRxtx", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-flavor-swap", + "description": "", + "links": [], + "name": "FlavorSwap", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-floating-ip-dns", + "description": "Floating IP DNS support.", + "links": [], + "name": "FloatingIpDns", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-floating-ip-pools", + "description": "Floating IPs support.", + "links": [], + "name": "FloatingIpPools", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-floating-ips", + "description": "Floating IPs support.", + "links": [], + "name": "FloatingIps", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-floating-ips-bulk", + "description": "Bulk handling of Floating IPs.", + "links": [], + "name": "FloatingIpsBulk", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-fping", + "description": "Fping Management Extension.", + "links": [], + "name": "Fping", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-hide-server-addresses", + "description": "Support hiding server addresses in certain states.", + "links": [], + "name": "HideServerAddresses", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-hosts", + "description": "Admin-only host administration.", + "links": [], + "name": "Hosts", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-hypervisor-status", + "description": "", + "links": [], + "name": "HypervisorStatus", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-hypervisors", + "description": "Admin-only hypervisor administration.", + "links": [], + "name": "Hypervisors", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-instance-actions", + "description": "View a log of actions and events taken on an instance.", + "links": [], + "name": "InstanceActions", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-instance_usage_audit_log", + "description": "Admin-only Task Log Monitoring.", + "links": [], + "name": "OSInstanceUsageAuditLog", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-keypairs", + "description": "Keypair Support.", + "links": [], + "name": "Keypairs", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-lock-server", + "description": "Enable lock/unlock server actions.", + "links": [], + "name": "LockServer", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-migrate-server", + "description": "Enable migrate and live-migrate server actions.", + "links": [], + "name": "MigrateServer", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-migrations", + "description": "Provide data on migrations.", + "links": [], + "name": "Migrations", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-multiple-create", + "description": "Allow multiple create in the Create Server v2.1 API.", + "links": [], + "name": "MultipleCreate", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-networks", + "description": "Admin-only Network Management Extension.", + "links": [], + "name": "Networks", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-networks-associate", + "description": "Network association support.", + "links": [], + "name": "NetworkAssociationSupport", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-pause-server", + "description": "Enable pause/unpause server actions.", + "links": [], + "name": "PauseServer", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-personality", + "description": "Personality support.", + "links": [], + "name": "Personality", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-preserve-ephemeral-rebuild", + "description": "Allow preservation of the ephemeral partition on rebuild.", + "links": [], + "name": "PreserveEphemeralOnRebuild", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-quota-class-sets", + "description": "Quota classes management support.", + "links": [], + "name": "QuotaClasses", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-quota-sets", + "description": "Quotas management support.", + "links": [], + "name": "Quotas", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-rescue", + "description": "Instance rescue mode.", + "links": [], + "name": "Rescue", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-security-group-default-rules", + "description": "Default rules for security group support.", + "links": [], + "name": "SecurityGroupDefaultRules", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-security-groups", + "description": "Security group support.", + "links": [], + "name": "SecurityGroups", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-diagnostics", + "description": "Allow Admins to view server diagnostics through server action.", + "links": [], + "name": "ServerDiagnostics", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-external-events", + "description": "Server External Event Triggers.", + "links": [], + "name": "ServerExternalEvents", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-group-quotas", + "description": "", + "links": [], + "name": "ServerGroupQuotas", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-groups", + "description": "Server group support.", + "links": [], + "name": "ServerGroups", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-list-multi-status", + "description": "", + "links": [], + "name": "ServerListMultiStatus", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-password", + "description": "Server password support.", + "links": [], + "name": "ServerPassword", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-sort-keys", + "description": "", + "links": [], + "name": "ServerSortKeys", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-start-stop", + "description": "", + "links": [], + "name": "ServerStartStop", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-services", + "description": "Services support.", + "links": [], + "name": "Services", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-shelve", + "description": "Instance shelve mode.", + "links": [], + "name": "Shelve", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-simple-tenant-usage", + "description": "Simple tenant usage extension.", + "links": [], + "name": "SimpleTenantUsage", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-suspend-server", + "description": "Enable suspend/resume server actions.", + "links": [], + "name": "SuspendServer", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-tenant-networks", + "description": "Tenant-based Network Management Extension.", + "links": [], + "name": "OSTenantNetworks", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-used-limits", + "description": "Provide data on limited resources that are being used.", + "links": [], + "name": "UsedLimits", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-used-limits-for-admin", + "description": "", + "links": [], + "name": "UsedLimitsForAdmin", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-user-data", + "description": "Add user_data to the Create Server API.", + "links": [], + "name": "UserData", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-user-quotas", + "description": "", + "links": [], + "name": "UserQuotas", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-virtual-interfaces", + "description": "Virtual interface support.", + "links": [], + "name": "VirtualInterfaces", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-volume-attachment-update", + "description": "", + "links": [], + "name": "VolumeAttachmentUpdate", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-volumes", + "description": "Volumes support.", + "links": [], + "name": "Volumes", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + } + ] +} \ No newline at end of file diff --git a/nova/tests/functional/api_sample_tests/api_samples/extensions-list-resp-v21-compatible.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/extensions-list-resp-v21-compatible.json.tpl new file mode 100644 index 0000000000..e1da6a0a09 --- /dev/null +++ b/nova/tests/functional/api_sample_tests/api_samples/extensions-list-resp-v21-compatible.json.tpl @@ -0,0 +1,804 @@ +{ + "extensions": [ + { + "alias": "NMN", + "description": "Multiple network support.", + "links": [], + "name": "Multinic", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-DCF", + "description": "Disk Management Extension.", + "links": [], + "name": "DiskConfig", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-EXT-AZ", + "description": "Extended Availability Zone support.", + "links": [], + "name": "ExtendedAvailabilityZone", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-EXT-IMG-SIZE", + "description": "Adds image size to image listings.", + "links": [], + "name": "ImageSize", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-EXT-IPS", + "description": "", + "links": [], + "name": "ExtendedIps", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-EXT-IPS-MAC", + "description": "", + "links": [], + "name": "ExtendedIpsMac", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-EXT-SRV-ATTR", + "description": "Extended Server Attributes support.", + "links": [], + "name": "ExtendedServerAttributes", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-EXT-STS", + "description": "", + "links": [], + "name": "ExtendedStatus", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-EXT-VIF-NET", + "description": "", + "links": [], + "name": "ExtendedVIFNet", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-FLV-DISABLED", + "description": "", + "links": [], + "name": "FlavorDisabled", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-FLV-EXT-DATA", + "description": "", + "links": [], + "name": "FlavorExtraData", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-SCH-HNT", + "description": "Pass arbitrary key/value pairs to the scheduler.", + "links": [], + "name": "SchedulerHints", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-SRV-USG", + "description": "Adds launched_at and terminated_at on Servers.", + "links": [], + "name": "ServerUsage", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-access-ips", + "description": "Access IPs support.", + "links": [], + "name": "AccessIPs", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-admin-actions", + "description": "Enable admin-only server actions\n\n Actions include: resetNetwork, injectNetworkInfo, os-resetState\n ", + "links": [], + "name": "AdminActions", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-admin-password", + "description": "Admin password management support.", + "links": [], + "name": "AdminPassword", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-agents", + "description": "Agents support.", + "links": [], + "name": "Agents", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-aggregates", + "description": "Admin-only aggregate administration.", + "links": [], + "name": "Aggregates", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-assisted-volume-snapshots", + "description": "Assisted volume snapshots.", + "links": [], + "name": "AssistedVolumeSnapshots", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-attach-interfaces", + "description": "Attach interface support.", + "links": [], + "name": "AttachInterfaces", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-availability-zone", + "description": "1. Add availability_zone to the Create Server API.\n 2. Add availability zones describing.\n ", + "links": [], + "name": "AvailabilityZone", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-baremetal-ext-status", + "description": "", + "links": [], + "name": "BareMetalExtStatus", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-baremetal-nodes", + "description": "Admin-only bare-metal node administration.", + "links": [], + "name": "BareMetalNodes", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-block-device-mapping", + "description": "Block device mapping boot support.", + "links": [], + "name": "BlockDeviceMapping", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-block-device-mapping-v2-boot", + "description": "", + "links": [], + "name": "BlockDeviceMappingV2Boot", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-cell-capacities", + "description": "", + "links": [], + "name": "CellCapacities", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-cells", + "description": "Enables cells-related functionality such as adding neighbor cells,\n listing neighbor cells, and getting the capabilities of the local cell.\n ", + "links": [], + "name": "Cells", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-certificates", + "description": "Certificates support.", + "links": [], + "name": "Certificates", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-cloudpipe", + "description": "Adds actions to create cloudpipe instances.\n\n When running with the Vlan network mode, you need a mechanism to route\n from the public Internet to your vlans. This mechanism is known as a\n cloudpipe.\n\n At the time of creating this class, only OpenVPN is supported. Support for\n a SSH Bastion host is forthcoming.\n ", + "links": [], + "name": "Cloudpipe", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-cloudpipe-update", + "description": "", + "links": [], + "name": "CloudpipeUpdate", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-config-drive", + "description": "Config Drive Extension.", + "links": [], + "name": "ConfigDrive", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-console-auth-tokens", + "description": "Console token authentication support.", + "links": [], + "name": "ConsoleAuthTokens", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-console-output", + "description": "Console log output support, with tailing ability.", + "links": [], + "name": "ConsoleOutput", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-consoles", + "description": "Interactive Console support.", + "links": [], + "name": "Consoles", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-create-backup", + "description": "Create a backup of a server.", + "links": [], + "name": "CreateBackup", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-create-server-ext", + "description": "", + "links": [], + "name": "Createserverext", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-deferred-delete", + "description": "Instance deferred delete.", + "links": [], + "name": "DeferredDelete", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-evacuate", + "description": "Enables server evacuation.", + "links": [], + "name": "Evacuate", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-evacuate-find-host", + "description": "", + "links": [], + "name": "ExtendedEvacuateFindHost", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-floating-ips", + "description": "", + "links": [], + "name": "ExtendedFloatingIps", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-hypervisors", + "description": "", + "links": [], + "name": "ExtendedHypervisors", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-networks", + "description": "", + "links": [], + "name": "ExtendedNetworks", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-quotas", + "description": "", + "links": [], + "name": "ExtendedQuotas", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-rescue-with-image", + "description": "", + "links": [], + "name": "ExtendedRescueWithImage", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-services", + "description": "", + "links": [], + "name": "ExtendedServices", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-services-delete", + "description": "", + "links": [], + "name": "ExtendedServicesDelete", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-status", + "description": "Extended Status support.", + "links": [], + "name": "ExtendedStatus", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-volumes", + "description": "Extended Volumes support.", + "links": [], + "name": "ExtendedVolumes", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-fixed-ips", + "description": "Fixed IPs support.", + "links": [], + "name": "FixedIPs", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-flavor-access", + "description": "Flavor access support.", + "links": [], + "name": "FlavorAccess", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-flavor-extra-specs", + "description": "Flavors extra specs support.", + "links": [], + "name": "FlavorExtraSpecs", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-flavor-manage", + "description": "Flavor create/delete API support.", + "links": [], + "name": "FlavorManage", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-flavor-rxtx", + "description": "Support to show the rxtx status of a flavor.", + "links": [], + "name": "FlavorRxtx", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-flavor-swap", + "description": "", + "links": [], + "name": "FlavorSwap", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-floating-ip-dns", + "description": "Floating IP DNS support.", + "links": [], + "name": "FloatingIpDns", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-floating-ip-pools", + "description": "Floating IPs support.", + "links": [], + "name": "FloatingIpPools", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-floating-ips", + "description": "Floating IPs support.", + "links": [], + "name": "FloatingIps", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-floating-ips-bulk", + "description": "Bulk handling of Floating IPs.", + "links": [], + "name": "FloatingIpsBulk", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-fping", + "description": "Fping Management Extension.", + "links": [], + "name": "Fping", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-hide-server-addresses", + "description": "Support hiding server addresses in certain states.", + "links": [], + "name": "HideServerAddresses", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-hosts", + "description": "Admin-only host administration.", + "links": [], + "name": "Hosts", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-hypervisor-status", + "description": "", + "links": [], + "name": "HypervisorStatus", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-hypervisors", + "description": "Admin-only hypervisor administration.", + "links": [], + "name": "Hypervisors", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-instance-actions", + "description": "View a log of actions and events taken on an instance.", + "links": [], + "name": "InstanceActions", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-instance_usage_audit_log", + "description": "Admin-only Task Log Monitoring.", + "links": [], + "name": "OSInstanceUsageAuditLog", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-keypairs", + "description": "Keypair Support.", + "links": [], + "name": "Keypairs", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-lock-server", + "description": "Enable lock/unlock server actions.", + "links": [], + "name": "LockServer", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-migrate-server", + "description": "Enable migrate and live-migrate server actions.", + "links": [], + "name": "MigrateServer", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-migrations", + "description": "Provide data on migrations.", + "links": [], + "name": "Migrations", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-multiple-create", + "description": "Allow multiple create in the Create Server v2.1 API.", + "links": [], + "name": "MultipleCreate", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-networks", + "description": "Admin-only Network Management Extension.", + "links": [], + "name": "Networks", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-networks-associate", + "description": "Network association support.", + "links": [], + "name": "NetworkAssociationSupport", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-pause-server", + "description": "Enable pause/unpause server actions.", + "links": [], + "name": "PauseServer", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-personality", + "description": "Personality support.", + "links": [], + "name": "Personality", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-preserve-ephemeral-rebuild", + "description": "Allow preservation of the ephemeral partition on rebuild.", + "links": [], + "name": "PreserveEphemeralOnRebuild", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-quota-class-sets", + "description": "Quota classes management support.", + "links": [], + "name": "QuotaClasses", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-quota-sets", + "description": "Quotas management support.", + "links": [], + "name": "Quotas", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-rescue", + "description": "Instance rescue mode.", + "links": [], + "name": "Rescue", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-security-group-default-rules", + "description": "Default rules for security group support.", + "links": [], + "name": "SecurityGroupDefaultRules", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-security-groups", + "description": "Security group support.", + "links": [], + "name": "SecurityGroups", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-diagnostics", + "description": "Allow Admins to view server diagnostics through server action.", + "links": [], + "name": "ServerDiagnostics", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-external-events", + "description": "Server External Event Triggers.", + "links": [], + "name": "ServerExternalEvents", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-group-quotas", + "description": "", + "links": [], + "name": "ServerGroupQuotas", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-groups", + "description": "Server group support.", + "links": [], + "name": "ServerGroups", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-list-multi-status", + "description": "", + "links": [], + "name": "ServerListMultiStatus", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-password", + "description": "Server password support.", + "links": [], + "name": "ServerPassword", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-sort-keys", + "description": "", + "links": [], + "name": "ServerSortKeys", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-start-stop", + "description": "", + "links": [], + "name": "ServerStartStop", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-services", + "description": "Services support.", + "links": [], + "name": "Services", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-shelve", + "description": "Instance shelve mode.", + "links": [], + "name": "Shelve", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-simple-tenant-usage", + "description": "Simple tenant usage extension.", + "links": [], + "name": "SimpleTenantUsage", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-suspend-server", + "description": "Enable suspend/resume server actions.", + "links": [], + "name": "SuspendServer", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-tenant-networks", + "description": "Tenant-based Network Management Extension.", + "links": [], + "name": "OSTenantNetworks", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-used-limits", + "description": "Provide data on limited resources that are being used.", + "links": [], + "name": "UsedLimits", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-used-limits-for-admin", + "description": "", + "links": [], + "name": "UsedLimitsForAdmin", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-user-data", + "description": "Add user_data to the Create Server API.", + "links": [], + "name": "UserData", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-user-quotas", + "description": "", + "links": [], + "name": "UserQuotas", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-virtual-interfaces", + "description": "Virtual interface support.", + "links": [], + "name": "VirtualInterfaces", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-volume-attachment-update", + "description": "", + "links": [], + "name": "VolumeAttachmentUpdate", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-volumes", + "description": "Volumes support.", + "links": [], + "name": "Volumes", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + } + ] +} \ No newline at end of file diff --git a/nova/tests/functional/api_sample_tests/api_samples/extensions-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/extensions-list-resp.json.tpl new file mode 100644 index 0000000000..751260d89f --- /dev/null +++ b/nova/tests/functional/api_sample_tests/api_samples/extensions-list-resp.json.tpl @@ -0,0 +1,796 @@ +{ + "extensions": [ + { + "alias": "NMN", + "description": "Multiple network support.", + "links": [], + "name": "Multinic", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-DCF", + "description": "Disk Management Extension.", + "links": [], + "name": "DiskConfig", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-EXT-AZ", + "description": "Extended Availability Zone support.", + "links": [], + "name": "ExtendedAvailabilityZone", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-EXT-IMG-SIZE", + "description": "Adds image size to image listings.", + "links": [], + "name": "ImageSize", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-EXT-IPS", + "description": "", + "links": [], + "name": "ExtendedIps", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-EXT-IPS-MAC", + "description": "", + "links": [], + "name": "ExtendedIpsMac", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-EXT-SRV-ATTR", + "description": "Extended Server Attributes support.", + "links": [], + "name": "ExtendedServerAttributes", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-EXT-STS", + "description": "", + "links": [], + "name": "ExtendedStatus", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-FLV-DISABLED", + "description": "", + "links": [], + "name": "FlavorDisabled", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-FLV-EXT-DATA", + "description": "", + "links": [], + "name": "FlavorExtraData", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-SCH-HNT", + "description": "Pass arbitrary key/value pairs to the scheduler.", + "links": [], + "name": "SchedulerHints", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "OS-SRV-USG", + "description": "Adds launched_at and terminated_at on Servers.", + "links": [], + "name": "ServerUsage", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-access-ips", + "description": "Access IPs support.", + "links": [], + "name": "AccessIPs", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-admin-actions", + "description": "Enable admin-only server actions\n\n Actions include: resetNetwork, injectNetworkInfo, os-resetState\n ", + "links": [], + "name": "AdminActions", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-admin-password", + "description": "Admin password management support.", + "links": [], + "name": "AdminPassword", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-agents", + "description": "Agents support.", + "links": [], + "name": "Agents", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-aggregates", + "description": "Admin-only aggregate administration.", + "links": [], + "name": "Aggregates", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-assisted-volume-snapshots", + "description": "Assisted volume snapshots.", + "links": [], + "name": "AssistedVolumeSnapshots", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-attach-interfaces", + "description": "Attach interface support.", + "links": [], + "name": "AttachInterfaces", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-availability-zone", + "description": "1. Add availability_zone to the Create Server API.\n 2. Add availability zones describing.\n ", + "links": [], + "name": "AvailabilityZone", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-baremetal-ext-status", + "description": "", + "links": [], + "name": "BareMetalExtStatus", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-baremetal-nodes", + "description": "Admin-only bare-metal node administration.", + "links": [], + "name": "BareMetalNodes", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-block-device-mapping", + "description": "Block device mapping boot support.", + "links": [], + "name": "BlockDeviceMapping", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-block-device-mapping-v2-boot", + "description": "", + "links": [], + "name": "BlockDeviceMappingV2Boot", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-cell-capacities", + "description": "", + "links": [], + "name": "CellCapacities", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-cells", + "description": "Enables cells-related functionality such as adding neighbor cells,\n listing neighbor cells, and getting the capabilities of the local cell.\n ", + "links": [], + "name": "Cells", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-certificates", + "description": "Certificates support.", + "links": [], + "name": "Certificates", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-cloudpipe", + "description": "Adds actions to create cloudpipe instances.\n\n When running with the Vlan network mode, you need a mechanism to route\n from the public Internet to your vlans. This mechanism is known as a\n cloudpipe.\n\n At the time of creating this class, only OpenVPN is supported. Support for\n a SSH Bastion host is forthcoming.\n ", + "links": [], + "name": "Cloudpipe", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-cloudpipe-update", + "description": "", + "links": [], + "name": "CloudpipeUpdate", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-config-drive", + "description": "Config Drive Extension.", + "links": [], + "name": "ConfigDrive", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-console-auth-tokens", + "description": "Console token authentication support.", + "links": [], + "name": "ConsoleAuthTokens", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-console-output", + "description": "Console log output support, with tailing ability.", + "links": [], + "name": "ConsoleOutput", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-consoles", + "description": "Interactive Console support.", + "links": [], + "name": "Consoles", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-create-backup", + "description": "Create a backup of a server.", + "links": [], + "name": "CreateBackup", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-create-server-ext", + "description": "", + "links": [], + "name": "Createserverext", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-deferred-delete", + "description": "Instance deferred delete.", + "links": [], + "name": "DeferredDelete", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-evacuate", + "description": "Enables server evacuation.", + "links": [], + "name": "Evacuate", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-evacuate-find-host", + "description": "", + "links": [], + "name": "ExtendedEvacuateFindHost", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-floating-ips", + "description": "", + "links": [], + "name": "ExtendedFloatingIps", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-hypervisors", + "description": "", + "links": [], + "name": "ExtendedHypervisors", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-networks", + "description": "", + "links": [], + "name": "ExtendedNetworks", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-quotas", + "description": "", + "links": [], + "name": "ExtendedQuotas", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-rescue-with-image", + "description": "", + "links": [], + "name": "ExtendedRescueWithImage", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-services", + "description": "", + "links": [], + "name": "ExtendedServices", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-services-delete", + "description": "", + "links": [], + "name": "ExtendedServicesDelete", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-status", + "description": "Extended Status support.", + "links": [], + "name": "ExtendedStatus", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-extended-volumes", + "description": "Extended Volumes support.", + "links": [], + "name": "ExtendedVolumes", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-fixed-ips", + "description": "Fixed IPs support.", + "links": [], + "name": "FixedIPs", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-flavor-access", + "description": "Flavor access support.", + "links": [], + "name": "FlavorAccess", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-flavor-extra-specs", + "description": "Flavors extra specs support.", + "links": [], + "name": "FlavorExtraSpecs", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-flavor-manage", + "description": "Flavor create/delete API support.", + "links": [], + "name": "FlavorManage", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-flavor-rxtx", + "description": "Support to show the rxtx status of a flavor.", + "links": [], + "name": "FlavorRxtx", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-flavor-swap", + "description": "", + "links": [], + "name": "FlavorSwap", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-floating-ip-dns", + "description": "Floating IP DNS support.", + "links": [], + "name": "FloatingIpDns", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-floating-ip-pools", + "description": "Floating IPs support.", + "links": [], + "name": "FloatingIpPools", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-floating-ips", + "description": "Floating IPs support.", + "links": [], + "name": "FloatingIps", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-floating-ips-bulk", + "description": "Bulk handling of Floating IPs.", + "links": [], + "name": "FloatingIpsBulk", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-fping", + "description": "Fping Management Extension.", + "links": [], + "name": "Fping", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-hide-server-addresses", + "description": "Support hiding server addresses in certain states.", + "links": [], + "name": "HideServerAddresses", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-hosts", + "description": "Admin-only host administration.", + "links": [], + "name": "Hosts", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-hypervisor-status", + "description": "", + "links": [], + "name": "HypervisorStatus", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-hypervisors", + "description": "Admin-only hypervisor administration.", + "links": [], + "name": "Hypervisors", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-instance-actions", + "description": "View a log of actions and events taken on an instance.", + "links": [], + "name": "InstanceActions", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-instance_usage_audit_log", + "description": "Admin-only Task Log Monitoring.", + "links": [], + "name": "OSInstanceUsageAuditLog", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-keypairs", + "description": "Keypair Support.", + "links": [], + "name": "Keypairs", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-lock-server", + "description": "Enable lock/unlock server actions.", + "links": [], + "name": "LockServer", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-migrate-server", + "description": "Enable migrate and live-migrate server actions.", + "links": [], + "name": "MigrateServer", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-migrations", + "description": "Provide data on migrations.", + "links": [], + "name": "Migrations", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-multiple-create", + "description": "Allow multiple create in the Create Server v2.1 API.", + "links": [], + "name": "MultipleCreate", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-networks", + "description": "Admin-only Network Management Extension.", + "links": [], + "name": "Networks", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-networks-associate", + "description": "Network association support.", + "links": [], + "name": "NetworkAssociationSupport", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-pause-server", + "description": "Enable pause/unpause server actions.", + "links": [], + "name": "PauseServer", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-personality", + "description": "Personality support.", + "links": [], + "name": "Personality", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-preserve-ephemeral-rebuild", + "description": "Allow preservation of the ephemeral partition on rebuild.", + "links": [], + "name": "PreserveEphemeralOnRebuild", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-quota-class-sets", + "description": "Quota classes management support.", + "links": [], + "name": "QuotaClasses", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-quota-sets", + "description": "Quotas management support.", + "links": [], + "name": "Quotas", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-rescue", + "description": "Instance rescue mode.", + "links": [], + "name": "Rescue", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-security-group-default-rules", + "description": "Default rules for security group support.", + "links": [], + "name": "SecurityGroupDefaultRules", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-security-groups", + "description": "Security group support.", + "links": [], + "name": "SecurityGroups", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-diagnostics", + "description": "Allow Admins to view server diagnostics through server action.", + "links": [], + "name": "ServerDiagnostics", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-external-events", + "description": "Server External Event Triggers.", + "links": [], + "name": "ServerExternalEvents", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-group-quotas", + "description": "", + "links": [], + "name": "ServerGroupQuotas", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-groups", + "description": "Server group support.", + "links": [], + "name": "ServerGroups", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-list-multi-status", + "description": "", + "links": [], + "name": "ServerListMultiStatus", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-password", + "description": "Server password support.", + "links": [], + "name": "ServerPassword", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-sort-keys", + "description": "", + "links": [], + "name": "ServerSortKeys", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-server-start-stop", + "description": "", + "links": [], + "name": "ServerStartStop", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-services", + "description": "Services support.", + "links": [], + "name": "Services", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-shelve", + "description": "Instance shelve mode.", + "links": [], + "name": "Shelve", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-simple-tenant-usage", + "description": "Simple tenant usage extension.", + "links": [], + "name": "SimpleTenantUsage", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-suspend-server", + "description": "Enable suspend/resume server actions.", + "links": [], + "name": "SuspendServer", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-tenant-networks", + "description": "Tenant-based Network Management Extension.", + "links": [], + "name": "OSTenantNetworks", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-used-limits", + "description": "Provide data on limited resources that are being used.", + "links": [], + "name": "UsedLimits", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-used-limits-for-admin", + "description": "", + "links": [], + "name": "UsedLimitsForAdmin", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-user-data", + "description": "Add user_data to the Create Server API.", + "links": [], + "name": "UserData", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-user-quotas", + "description": "", + "links": [], + "name": "UserQuotas", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-virtual-interfaces", + "description": "Virtual interface support.", + "links": [], + "name": "VirtualInterfaces", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-volume-attachment-update", + "description": "", + "links": [], + "name": "VolumeAttachmentUpdate", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + }, + { + "alias": "os-volumes", + "description": "Volumes support.", + "links": [], + "name": "Volumes", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" + } + ] +} \ No newline at end of file diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-extended-availability-zone/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-extended-availability-zone/server-get-resp.json.tpl deleted file mode 100644 index e7eebb11a6..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-extended-availability-zone/server-get-resp.json.tpl +++ /dev/null @@ -1,58 +0,0 @@ -{ - "server": { - "updated": "%(isotime)s", - "created": "%(isotime)s", - "OS-EXT-AZ:availability_zone": "nova", - "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/%(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-availability-zone/servers-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-extended-availability-zone/servers-detail-resp.json.tpl deleted file mode 100644 index f9748ad2d1..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-extended-availability-zone/servers-detail-resp.json.tpl +++ /dev/null @@ -1,60 +0,0 @@ -{ - "servers": [ - { - "updated": "%(isotime)s", - "created": "%(isotime)s", - "OS-EXT-AZ:availability_zone": "nova", - "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", - "key_name": null - } - ] -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-extended-status/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-extended-status/server-get-resp.json.tpl deleted file mode 100644 index 95a53548f9..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-extended-status/server-get-resp.json.tpl +++ /dev/null @@ -1,61 +0,0 @@ -{ - "server": { - "OS-EXT-STS:task_state": null, - "OS-EXT-STS:vm_state": "active", - "OS-EXT-STS:power_state": 1, - "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-status/servers-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-extended-status/servers-detail-resp.json.tpl deleted file mode 100644 index 21b316a3ce..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-extended-status/servers-detail-resp.json.tpl +++ /dev/null @@ -1,61 +0,0 @@ -{ - "servers": [ - { - "OS-EXT-STS:task_state": null, - "OS-EXT-STS:vm_state": "active", - "OS-EXT-STS:power_state": 1, - "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-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 9474dc1308..dff4fce32d 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 @@ -40,7 +40,24 @@ "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-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" + } + ], "status": "ACTIVE", "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", 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 37a5454208..fafd0f590c 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 @@ -40,7 +40,24 @@ "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-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" + } + ], "status": "ACTIVE", "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-get-resp.json.tpl deleted file mode 100644 index 83c62840b9..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/server-get-resp.json.tpl +++ /dev/null @@ -1,58 +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", - "security_groups": [{"name": "test"}], - "key_name": null - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/servers-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/servers-detail-resp.json.tpl deleted file mode 100644 index b7d2cead1e..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-security-groups/servers-detail-resp.json.tpl +++ /dev/null @@ -1,59 +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", - "security_groups": [{"name": "test"}], - "key_name": null - }] -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-server-usage/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-server-usage/server-get-resp.json.tpl deleted file mode 100644 index 2d940e7083..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-server-usage/server-get-resp.json.tpl +++ /dev/null @@ -1,59 +0,0 @@ -{ - "server": { - "accessIPv4": "%(access_ip_v4)s", - "accessIPv6": "%(access_ip_v6)s", - "OS-SRV-USG:launched_at": "%(strtime)s", - "OS-SRV-USG:terminated_at": null, - "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" - } - ] - }, - "key_name": null, - "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" - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-server-usage/servers-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-server-usage/servers-detail-resp.json.tpl deleted file mode 100644 index 2a10480534..0000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-server-usage/servers-detail-resp.json.tpl +++ /dev/null @@ -1,60 +0,0 @@ -{ - "servers": [ - { - "accessIPv4": "%(access_ip_v4)s", - "accessIPv6": "%(access_ip_v6)s", - "status": "ACTIVE", - "created": "%(isotime)s", - "OS-SRV-USG:launched_at": "%(strtime)s", - "user_id": "fake", - "addresses": { - "private": [ - { - "addr": "%(ip)s", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", - "OS-EXT-IPS:type": "fixed", - "version": 4 - } - ] - }, - "key_name": null, - "links": [ - { - "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/servers/%(id)s", - "rel": "bookmark" - } - ], - "updated": "%(isotime)s", - "name": "new-server-test", - "image": { - "id": "%(uuid)s", - "links": [ - { - "href": "%(compute_endpoint)s/images/%(uuid)s", - "rel": "bookmark" - } - ] - }, - "id": "%(uuid)s", - "OS-SRV-USG:terminated_at": null, - "tenant_id": "6f70656e737461636b20342065766572", - "progress": 0, - "flavor": { - "id": "1", - "links": [ - { - "href": "%(compute_endpoint)s/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "%(hostid)s", - "metadata": { - "My Server Name": "Apache1" - } - }] -} 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 89b57dc05e..2109fa3c38 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 @@ -13,6 +13,11 @@ "path": "/etc/banner.txt", "contents": "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 b25zLiINCg0KLVJpY2hhcmQgQmFjaA==" } + ], + "security_groups": [ + { + "name": "default" + } ] } } 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 5fc328cee3..65ef37bcc4 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,24 @@ "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-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" + } + ], "status": "ACTIVE", "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", 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 de4277d330..9fa0cc32a9 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,24 @@ "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-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" + } + ], "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 8fbb0f58a0..f5f67cb635 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 @@ -49,7 +49,32 @@ }, "name": "new-server-test", "description": "new-server-description", + "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", "status": "ACTIVE", "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-post-resp.json.tpl index 5358868400..4b30e0cfbd 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-post-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-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/servers/v2.19/server-put-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-put-resp.json.tpl index eea4e00d6e..31e9a32b3b 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-put-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/server-put-resp.json.tpl @@ -2,6 +2,7 @@ "server": { "accessIPv4": "%(access_ip_v4)s", "accessIPv6": "%(access_ip_v6)s", + "OS-DCF:diskConfig": "AUTO", "addresses": { "private": [ { 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 b300bbb4a8..c0ab6c5e27 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 @@ -50,7 +50,32 @@ }, "name": "new-server-test", "description": "new-server-description", + "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", "status": "ACTIVE", "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", 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 fa749326fc..4453d864ef 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 @@ -48,7 +48,31 @@ "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": [], + "OS-SRV-USG:launched_at": "%(strtime)s", + "OS-SRV-USG:terminated_at": null, "progress": 0, + "security_groups": [ + { + "name": "default" + } + ], "status": "ACTIVE", "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", 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 554f5e3d28..8cfa57b31f 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 @@ -49,7 +49,31 @@ "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": [], + "OS-SRV-USG:launched_at": "%(strtime)s", + "OS-SRV-USG:terminated_at": null, "progress": 0, + "security_groups": [ + { + "name": "default" + } + ], "status": "ACTIVE", "tenant_id": "6f70656e737461636b20342065766572", "updated": "%(isotime)s", diff --git a/nova/tests/functional/api_sample_tests/test_extended_availability_zone.py b/nova/tests/functional/api_sample_tests/test_extended_availability_zone.py deleted file mode 100644 index 19432528a2..0000000000 --- a/nova/tests/functional/api_sample_tests/test_extended_availability_zone.py +++ /dev/null @@ -1,38 +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 ExtendedAvailabilityZoneJsonTests(test_servers.ServersSampleBase): - extension_name = "os-extended-availability-zone" - - def test_show(self): - uuid = self._post_server() - 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): - self._post_server() - response = self._do_get('servers/detail') - subs = {} - 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_extended_status.py b/nova/tests/functional/api_sample_tests/test_extended_status.py deleted file mode 100644 index 55999f11d8..0000000000 --- a/nova/tests/functional/api_sample_tests/test_extended_status.py +++ /dev/null @@ -1,39 +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 ExtendedStatusSampleJsonTests(test_servers.ServersSampleBase): - extension_name = "os-extended-status" - - def test_show(self): - uuid = self._post_server() - 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() - 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_extension_info.py b/nova/tests/functional/api_sample_tests/test_extension_info.py index ce7983e7f3..5677ca3ea8 100644 --- a/nova/tests/functional/api_sample_tests/test_extension_info.py +++ b/nova/tests/functional/api_sample_tests/test_extension_info.py @@ -26,6 +26,7 @@ def fake_soft_extension_authorizer(extension_name, core=False): class ExtensionInfoAllSamplesJsonTest(api_sample_base.ApiSampleTestBaseV21): + sample_dir = "all_extensions" all_extensions = True @mock.patch.object(api_extensions, 'os_compute_soft_authorizer') diff --git a/nova/tests/functional/api_sample_tests/test_security_groups.py b/nova/tests/functional/api_sample_tests/test_security_groups.py index d5cd26927c..eb91156e6c 100644 --- a/nova/tests/functional/api_sample_tests/test_security_groups.py +++ b/nova/tests/functional/api_sample_tests/test_security_groups.py @@ -75,27 +75,6 @@ class SecurityGroupsJsonTest(test_servers.ServersSampleBase): self.stub_out(path + 'create_security_group', fake_create_security_group) - def test_server_create(self): - self._post_server(use_common_server_api_samples=False) - - def test_server_get(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'] = '1.2.3.4' - subs['access_ip_v6'] = '80fe::' - self._verify_response('server-get-resp', subs, response, 200) - - def test_server_detail(self): - 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'] = '1.2.3.4' - subs['access_ip_v6'] = '80fe::' - self._verify_response('servers-detail-resp', subs, response, 200) - def _get_create_subs(self): return { 'group_name': 'default', diff --git a/nova/tests/functional/api_sample_tests/test_server_usage.py b/nova/tests/functional/api_sample_tests/test_server_usage.py deleted file mode 100644 index daad7c501d..0000000000 --- a/nova/tests/functional/api_sample_tests/test_server_usage.py +++ /dev/null @@ -1,43 +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 ServerUsageSampleJsonTest(test_servers.ServersSampleBase): - extension_name = 'os-server-usage' - - def setUp(self): - """setUp method for server usage.""" - super(ServerUsageSampleJsonTest, self).setUp() - self.uuid = self._post_server() - - def test_show(self): - response = self._do_get('servers/%s' % self.uuid) - subs = {} - subs['id'] = self.uuid - 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_details(self): - response = self._do_get('servers/detail') - subs = {} - subs['id'] = self.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_servers.py b/nova/tests/functional/api_sample_tests/test_servers.py index 77dc15f699..b1d73c1d09 100644 --- a/nova/tests/functional/api_sample_tests/test_servers.py +++ b/nova/tests/functional/api_sample_tests/test_servers.py @@ -68,6 +68,10 @@ 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() @@ -77,7 +81,9 @@ class ServersSampleJsonTest(ServersSampleBase): subs = {} subs['hostid'] = '[a-f0-9]+' subs['id'] = uuid + subs['instance_name'] = 'instance-\d{8}' subs['hypervisor_hostname'] = r'[\w\.\-]+' + subs['hostname'] = r'[\w\.\-]+' 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::' @@ -95,7 +101,9 @@ class ServersSampleJsonTest(ServersSampleBase): subs = {} subs['hostid'] = '[a-f0-9]+' subs['id'] = uuid + subs['instance_name'] = 'instance-\d{8}' subs['hypervisor_hostname'] = r'[\w\.\-]+' + subs['hostname'] = r'[\w\.\-]+' 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::' @@ -159,11 +167,6 @@ class ServerSortKeysJsonTests(ServersSampleBase): 200) -class ServersSampleAllExtensionJsonTest(ServersSampleJsonTest): - all_extensions = True - sample_dir = None - - class ServersActionsJsonTest(ServersSampleBase): sample_dir = 'servers' diff --git a/nova/tests/functional/api_samples_test_base.py b/nova/tests/functional/api_samples_test_base.py index fa617fdaa1..01322b9aad 100644 --- a/nova/tests/functional/api_samples_test_base.py +++ b/nova/tests/functional/api_samples_test_base.py @@ -94,19 +94,12 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase): def _get_sample_path(cls, name, dirname, suffix='', api_version=None): parts = [dirname] parts.append('api_samples') - # TODO(gmann): Once all tests gets merged for all extension - # then we need to have a simple logic here to select sample file - # directory which will be based on cls.sample_dir and api_version. - # All other things will go away from here. Currently hacking this - # till we merge every extensions tests. - if cls.all_extensions and not cls.sample_dir: - parts.append('all_extensions') # Note(gmann): if _use_common_server_api_samples is set to True # then common server sample files present in 'servers' directory # will be used. As of now it is being used for server POST request # to avoid duplicate copy of server req and resp sample files. # Example - ServersSampleBase's _post_server method. - elif cls._use_common_server_api_samples: + if cls._use_common_server_api_samples: parts.append('servers') else: if cls.sample_dir: