diff --git a/doc/api_samples/all_extensions/server-action-confirm-resize.json b/doc/api_samples/all_extensions/server-action-confirm-resize.json deleted file mode 100644 index 2940d2a3925a..000000000000 --- a/doc/api_samples/all_extensions/server-action-confirm-resize.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "confirmResize" : null -} \ No newline at end of file diff --git a/doc/api_samples/all_extensions/server-action-create-image.json b/doc/api_samples/all_extensions/server-action-create-image.json deleted file mode 100644 index dcb5165e48f7..000000000000 --- a/doc/api_samples/all_extensions/server-action-create-image.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "createImage" : { - "name" : "foo-image", - "metadata": { - "meta_var": "meta_val" - } - } -} \ No newline at end of file diff --git a/doc/api_samples/all_extensions/server-action-reboot.json b/doc/api_samples/all_extensions/server-action-reboot.json deleted file mode 100644 index 3920ea7285e0..000000000000 --- a/doc/api_samples/all_extensions/server-action-reboot.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "reboot" : { - "type" : "SOFT" - } -} \ No newline at end of file diff --git a/doc/api_samples/all_extensions/server-action-rebuild-resp.json b/doc/api_samples/all_extensions/server-action-rebuild-resp.json deleted file mode 100644 index e7d03272eefe..000000000000 --- a/doc/api_samples/all_extensions/server-action-rebuild-resp.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "server": { - "OS-DCF:diskConfig": "AUTO", - "accessIPv4": "1.2.3.4", - "accessIPv6": "80fe::", - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "version": 4 - } - ] - }, - "adminPass": "seekr3t", - "created": "2012-09-25T13:36:08Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "935dcd1019fd43814a1d2a6e9b320dcac352d3a02c69f8be7ba41002", - "id": "27568e59-cfb7-4283-a00e-4af933f2d539", - "image": { - "id": "70a599e0-31e7-49b7-b260-868f441e862b", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "bookmark" - } - ] - }, - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/27568e59-cfb7-4283-a00e-4af933f2d539", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/27568e59-cfb7-4283-a00e-4af933f2d539", - "rel": "bookmark" - } - ], - "metadata": { - "meta var": "meta val" - }, - "name": "foobar", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2012-09-25T13:36:09Z", - "user_id": "fake" - } -} \ No newline at end of file diff --git a/doc/api_samples/all_extensions/server-action-rebuild.json b/doc/api_samples/all_extensions/server-action-rebuild.json deleted file mode 100644 index f79d3b7f24fa..000000000000 --- a/doc/api_samples/all_extensions/server-action-rebuild.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "rebuild" : { - "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b", - "name" : "foobar", - "adminPass" : "seekr3t", - "accessIPv4" : "1.2.3.4", - "accessIPv6" : "80fe::", - "metadata" : { - "meta var" : "meta val" - }, - "personality" : [ - { - "path" : "/etc/banner.txt", - "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 b25zLiINCg0KLVJpY2hhcmQgQmFjaA==" - } - ] - } -} diff --git a/doc/api_samples/all_extensions/server-action-resize.json b/doc/api_samples/all_extensions/server-action-resize.json deleted file mode 100644 index bdaa37a17633..000000000000 --- a/doc/api_samples/all_extensions/server-action-resize.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "resize" : { - "flavorRef" : "2" - } -} \ No newline at end of file diff --git a/doc/api_samples/all_extensions/server-action-revert-resize.json b/doc/api_samples/all_extensions/server-action-revert-resize.json deleted file mode 100644 index 76c460242cc2..000000000000 --- a/doc/api_samples/all_extensions/server-action-revert-resize.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "revertResize" : null -} \ No newline at end of file diff --git a/doc/api_samples/os-access-ips/server-action-rebuild-resp.json b/doc/api_samples/os-access-ips/server-action-rebuild-resp.json deleted file mode 100644 index 79b0568347ed..000000000000 --- a/doc/api_samples/os-access-ips/server-action-rebuild-resp.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "server": { - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "version": 4 - } - ] - }, - "adminPass": "99WHAxN8gpvg", - "created": "2013-11-06T07:51:09Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "5c8072dbcda8ce3f26deb6662bd7718e1a6d349bdf2296911d1be4ac", - "id": "53a63a19-c145-47f8-9ae5-b39d6bff33ec", - "image": { - "id": "70a599e0-31e7-49b7-b260-868f441e862b", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "bookmark" - } - ] - }, - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/53a63a19-c145-47f8-9ae5-b39d6bff33ec", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/53a63a19-c145-47f8-9ae5-b39d6bff33ec", - "rel": "bookmark" - } - ], - "metadata": { - "meta_var": "meta_val" - }, - "name": "new-server-test", - "accessIPv4": "4.3.2.1", - "accessIPv6": "80fe::", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2013-11-06T07:51:11Z", - "user_id": "fake" - } -} diff --git a/doc/api_samples/os-access-ips/server-action-rebuild.json b/doc/api_samples/os-access-ips/server-action-rebuild.json deleted file mode 100644 index 15550d0a6551..000000000000 --- a/doc/api_samples/os-access-ips/server-action-rebuild.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "rebuild" : { - "accessIPv4": "4.3.2.1", - "accessIPv6": "80fe::", - "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b", - "name" : "new-server-test", - "metadata" : { - "meta_var" : "meta_val" - } - } -} diff --git a/doc/api_samples/os-disk-config/server-action-rebuild-req.json b/doc/api_samples/os-disk-config/server-action-rebuild-req.json deleted file mode 100644 index 670e11e79b4f..000000000000 --- a/doc/api_samples/os-disk-config/server-action-rebuild-req.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "rebuild": { - "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b", - "OS-DCF:diskConfig": "AUTO" - } -} diff --git a/doc/api_samples/os-disk-config/server-action-rebuild-resp.json b/doc/api_samples/os-disk-config/server-action-rebuild-resp.json deleted file mode 100644 index 8c6abaff81a0..000000000000 --- a/doc/api_samples/os-disk-config/server-action-rebuild-resp.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "server": { - "OS-DCF:diskConfig": "AUTO", - "accessIPv4": "", - "accessIPv6": "", - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "version": 4 - } - ] - }, - "adminPass": "NBjMaJoFL4EF", - "created": "2012-12-02T02:11:56Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "c076393ad900d62c4805a42df10d9b364f629842681c00cce035487f", - "id": "63a8aa13-60fe-41c4-b079-77f6fdf3c841", - "image": { - "id": "70a599e0-31e7-49b7-b260-868f441e862b", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "bookmark" - } - ] - }, - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/63a8aa13-60fe-41c4-b079-77f6fdf3c841", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/63a8aa13-60fe-41c4-b079-77f6fdf3c841", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2012-12-02T02:11:56Z", - "user_id": "fake" - } -} \ No newline at end of file diff --git a/doc/api_samples/os-disk-config/server-resize-post-req.json b/doc/api_samples/os-disk-config/server-resize-post-req.json deleted file mode 100644 index 55e11a31ed89..000000000000 --- a/doc/api_samples/os-disk-config/server-resize-post-req.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "resize": { - "flavorRef": "3", - "OS-DCF:diskConfig": "AUTO" - } -} \ No newline at end of file diff --git a/doc/api_samples/os-personality/server-action-rebuild-req.json b/doc/api_samples/os-personality/server-action-rebuild-req.json deleted file mode 100644 index 0874437e0c07..000000000000 --- a/doc/api_samples/os-personality/server-action-rebuild-req.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "rebuild": { - "accessIPv4" : "1.2.3.4", - "accessIPv6" : "80fe::", - "imageRef": "70a599e0-31e7-49b7-b260-868f441e862b", - "name": "new-server-test", - "metadata": { - "meta_var": "meta_val" - }, - "personality": [ - { - "path": "/etc/banner.txt", - "contents": "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 b25zLiINCg0KLVJpY2hhcmQgQmFjaA==" - } - ] - } -} diff --git a/doc/api_samples/os-personality/server-action-rebuild-resp.json b/doc/api_samples/os-personality/server-action-rebuild-resp.json deleted file mode 100644 index b8888206e094..000000000000 --- a/doc/api_samples/os-personality/server-action-rebuild-resp.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "server": { - "accessIPv4" : "1.2.3.4", - "accessIPv6" : "80fe::", - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "version": 4 - } - ] - }, - "adminPass": "99WHAxN8gpvg", - "created": "2013-11-06T07:51:09Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "5c8072dbcda8ce3f26deb6662bd7718e1a6d349bdf2296911d1be4ac", - "id": "53a63a19-c145-47f8-9ae5-b39d6bff33ec", - "image": { - "id": "70a599e0-31e7-49b7-b260-868f441e862b", - "links": [ - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "bookmark" - } - ] - }, - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/53a63a19-c145-47f8-9ae5-b39d6bff33ec", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/53a63a19-c145-47f8-9ae5-b39d6bff33ec", - "rel": "bookmark" - } - ], - "metadata": { - "meta_var": "meta_val" - }, - "name": "new-server-test", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "2013-11-06T07:51:11Z", - "user_id": "fake" - } -} diff --git a/doc/api_samples/os-personality/server-post-req.json b/doc/api_samples/os-personality/server-post-req.json deleted file mode 100644 index 5574b7305089..000000000000 --- a/doc/api_samples/os-personality/server-post-req.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "server": { - "name": "new-server-test", - "imageRef": "70a599e0-31e7-49b7-b260-868f441e862b", - "flavorRef": "1", - "metadata": { - "My Server Name": "Apache1" - }, - "personality": [ - { - "path": "/etc/banner.txt", - "contents": "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA==" - } - ] - } -} diff --git a/doc/api_samples/os-personality/server-post-resp.json b/doc/api_samples/os-personality/server-post-resp.json deleted file mode 100644 index 9c31e93c9a02..000000000000 --- a/doc/api_samples/os-personality/server-post-resp.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "server": { - "adminPass": "n7JGBda664QG", - "id": "934760e1-2b0b-4f9e-a916-eac1e69839dc", - "links": [ - { - "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/934760e1-2b0b-4f9e-a916-eac1e69839dc", - "rel": "self" - }, - { - "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/934760e1-2b0b-4f9e-a916-eac1e69839dc", - "rel": "bookmark" - } - ] - } -} \ No newline at end of file diff --git a/doc/api_samples/servers/server-action-rebuild-resp.json b/doc/api_samples/servers/server-action-rebuild-resp.json index b4ce48c90097..b66dc4ce80d2 100644 --- a/doc/api_samples/servers/server-action-rebuild-resp.json +++ b/doc/api_samples/servers/server-action-rebuild-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/server-action-rebuild.json b/doc/api_samples/servers/server-action-rebuild.json index ef089054ea6e..787a8da89aa8 100644 --- a/doc/api_samples/servers/server-action-rebuild.json +++ b/doc/api_samples/servers/server-action-rebuild.json @@ -2,11 +2,18 @@ "rebuild" : { "accessIPv4" : "1.2.3.4", "accessIPv6" : "80fe::", + "OS-DCF:diskConfig": "AUTO", "imageRef" : "70a599e0-31e7-49b7-b260-868f441e862b", "name" : "foobar", "adminPass" : "seekr3t", "metadata" : { "meta_var" : "meta_val" - } + }, + "personality": [ + { + "path": "/etc/banner.txt", + "contents": "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 b25zLiINCg0KLVJpY2hhcmQgQmFjaA==" + } + ] } } diff --git a/doc/api_samples/servers/server-action-resize.json b/doc/api_samples/servers/server-action-resize.json index bdaa37a17633..ca41ee74f31b 100644 --- a/doc/api_samples/servers/server-action-resize.json +++ b/doc/api_samples/servers/server-action-resize.json @@ -1,5 +1,6 @@ { "resize" : { - "flavorRef" : "2" + "flavorRef" : "2", + "OS-DCF:diskConfig": "AUTO" } } \ No newline at end of file diff --git a/doc/api_samples/servers/server-create-req.json b/doc/api_samples/servers/server-create-req.json index ca53f3a7c26c..220575075f34 100644 --- a/doc/api_samples/servers/server-create-req.json +++ b/doc/api_samples/servers/server-create-req.json @@ -7,6 +7,12 @@ "flavorRef" : "1", "metadata" : { "My Server Name" : "Apache1" - } + }, + "personality": [ + { + "path": "/etc/banner.txt", + "contents": "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 b25zLiINCg0KLVJpY2hhcmQgQmFjaA==" + } + ] } } diff --git a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-confirm-resize.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-confirm-resize.json.tpl deleted file mode 100644 index 432f6126e906..000000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-confirm-resize.json.tpl +++ /dev/null @@ -1,3 +0,0 @@ -{ - "confirmResize" : null -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-create-image.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-create-image.json.tpl deleted file mode 100644 index 19c2c489a4d2..000000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-create-image.json.tpl +++ /dev/null @@ -1,9 +0,0 @@ -{ - "createImage" : { - "name" : "%(name)s", - "metadata": { - "meta_var": "meta_val" - } - } -} - diff --git a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-reboot.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-reboot.json.tpl deleted file mode 100644 index 18eda9b9abf7..000000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-reboot.json.tpl +++ /dev/null @@ -1,5 +0,0 @@ -{ - "reboot" : { - "type" : "%(type)s" - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-rebuild-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-rebuild-resp.json.tpl deleted file mode 100644 index 5a54ccd34715..000000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-rebuild-resp.json.tpl +++ /dev/null @@ -1,56 +0,0 @@ -{ - "server": { - "OS-DCF:diskConfig": "AUTO", - "accessIPv4": "%(access_ip_v4)s", - "accessIPv6": "%(access_ip_v6)s", - "addresses": { - "private": [ - { - "addr": "%(ip)s", - "version": 4 - } - ] - }, - "adminPass": "%(password)s", - "created": "%(isotime)s", - "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": { - "meta var": "meta val" - }, - "name": "%(name)s", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "%(isotime)s", - "user_id": "fake" - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-rebuild.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-rebuild.json.tpl deleted file mode 100644 index ba750155a3ad..000000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-rebuild.json.tpl +++ /dev/null @@ -1,18 +0,0 @@ -{ - "rebuild" : { - "imageRef" : "%(uuid)s", - "name" : "%(name)s", - "adminPass" : "%(pass)s", - "accessIPv4" : "%(access_ip_v4)s", - "accessIPv6" : "%(access_ip_v6)s", - "metadata" : { - "meta var" : "meta val" - }, - "personality" : [ - { - "path" : "/etc/banner.txt", - "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 b25zLiINCg0KLVJpY2hhcmQgQmFjaA==" - } - ] - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-resize.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-resize.json.tpl deleted file mode 100644 index 468a88da243c..000000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-resize.json.tpl +++ /dev/null @@ -1,5 +0,0 @@ -{ - "resize" : { - "flavorRef" : "%(id)s" - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-revert-resize.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-revert-resize.json.tpl deleted file mode 100644 index 2ddf6e5ab09e..000000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/all_extensions/server-action-revert-resize.json.tpl +++ /dev/null @@ -1,3 +0,0 @@ -{ - "revertResize" : null -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl deleted file mode 100644 index 19368fb6097b..000000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl +++ /dev/null @@ -1,55 +0,0 @@ -{ - "server": { - "addresses": { - "private": [ - { - "addr": "%(ip)s", - "version": 4 - } - ] - }, - "adminPass": "%(password)s", - "created": "%(isotime)s", - "flavor": { - "id": "1", - "links": [ - { - "href": "%(compute_endpoint)s/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "%(hostid)s", - "id": "%(uuid)s", - "image": { - "id": "%(image_id)s", - "links": [ - { - "href": "%(compute_endpoint)s/images/%(image_id)s", - "rel": "bookmark" - } - ] - }, - "links": [ - { - "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/servers/%(uuid)s", - "rel": "bookmark" - } - ], - "metadata": { - "meta_var": "meta_val" - }, - "name": "new-server-test", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "%(isotime)s", - "user_id": "fake", - "accessIPv4": "%(access_ip_v4)s", - "accessIPv6": "%(access_ip_v6)s" - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-action-rebuild.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-action-rebuild.json.tpl deleted file mode 100644 index 556946485d9d..000000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-access-ips/server-action-rebuild.json.tpl +++ /dev/null @@ -1,11 +0,0 @@ -{ - "rebuild" : { - "accessIPv4": "%(access_ip_v4)s", - "accessIPv6": "%(access_ip_v6)s", - "imageRef" : "%(image_id)s", - "name" : "new-server-test", - "metadata" : { - "meta_var" : "meta_val" - } - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-action-rebuild-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-action-rebuild-req.json.tpl deleted file mode 100644 index d58133faff38..000000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-action-rebuild-req.json.tpl +++ /dev/null @@ -1,6 +0,0 @@ -{ - "rebuild": { - "imageRef" : "%(image_id)s", - "OS-DCF:diskConfig": "AUTO" - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-action-rebuild-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-action-rebuild-resp.json.tpl deleted file mode 100644 index ae262efd16b3..000000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-action-rebuild-resp.json.tpl +++ /dev/null @@ -1,56 +0,0 @@ -{ - "server": { - "OS-DCF:diskConfig": "AUTO", - "accessIPv4": "", - "accessIPv6": "", - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "version": 4 - } - ] - }, - "adminPass": "%(password)s", - "created": "%(isotime)s", - "flavor": { - "id": "1", - "links": [ - { - "href": "%(compute_endpoint)s/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "%(hostid)s", - "id": "%(id)s", - "image": { - "id": "%(uuid)s", - "links": [ - { - "href": "%(compute_endpoint)s/images/%(uuid)s", - "rel": "bookmark" - } - ] - }, - "links": [ - { - "href": "%(versioned_compute_endpoint)s/servers/%(id)s", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/servers/%(id)s", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "6f70656e737461636b20342065766572", - "updated": "%(isotime)s", - "user_id": "fake" - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-resize-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-resize-post-req.json.tpl deleted file mode 100644 index a290485e1c26..000000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-disk-config/server-resize-post-req.json.tpl +++ /dev/null @@ -1,6 +0,0 @@ -{ - "resize": { - "flavorRef": "3", - "OS-DCF:diskConfig": "AUTO" - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-action-rebuild-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-action-rebuild-req.json.tpl deleted file mode 100644 index 89ed4d645677..000000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-action-rebuild-req.json.tpl +++ /dev/null @@ -1,17 +0,0 @@ -{ - "rebuild": { - "accessIPv4" : "%(access_ip_v4)s", - "accessIPv6" : "%(access_ip_v6)s", - "imageRef": "%(image_id)s", - "name": "new-server-test", - "metadata": { - "meta_var": "meta_val" - }, - "personality": [ - { - "path": "/etc/banner.txt", - "contents": "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 b25zLiINCg0KLVJpY2hhcmQgQmFjaA==" - } - ] - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-action-rebuild-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-action-rebuild-resp.json.tpl deleted file mode 100644 index cfb6d567eeb8..000000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-action-rebuild-resp.json.tpl +++ /dev/null @@ -1,55 +0,0 @@ -{ - "server": { - "accessIPv4": "%(access_ip_v4)s", - "accessIPv6": "%(access_ip_v6)s", - "addresses": { - "private": [ - { - "addr": "%(ip)s", - "version": 4 - } - ] - }, - "adminPass": "%(password)s", - "created": "%(isotime)s", - "flavor": { - "id": "1", - "links": [ - { - "href": "%(compute_endpoint)s/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "%(hostid)s", - "id": "%(uuid)s", - "image": { - "id": "%(image_id)s", - "links": [ - { - "href": "%(compute_endpoint)s/images/%(image_id)s", - "rel": "bookmark" - } - ] - }, - "links": [ - { - "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/servers/%(uuid)s", - "rel": "bookmark" - } - ], - "metadata": { - "meta_var": "meta_val" - }, - "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-personality/server-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-post-req.json.tpl deleted file mode 100644 index d797b9c007d2..000000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-post-req.json.tpl +++ /dev/null @@ -1,16 +0,0 @@ -{ - "server": { - "name": "new-server-test", - "imageRef": "%(image_id)s", - "flavorRef": "1", - "metadata": { - "My Server Name": "Apache1" - }, - "personality": [ - { - "path": "/etc/banner.txt", - "contents": "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA==" - } - ] - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-post-resp.json.tpl deleted file mode 100644 index 5358868400cd..000000000000 --- a/nova/tests/functional/api_sample_tests/api_samples/os-personality/server-post-resp.json.tpl +++ /dev/null @@ -1,16 +0,0 @@ -{ - "server": { - "adminPass": "%(password)s", - "id": "%(id)s", - "links": [ - { - "href": "%(versioned_compute_endpoint)s/servers/%(uuid)s", - "rel": "self" - }, - { - "href": "%(compute_endpoint)s/servers/%(uuid)s", - "rel": "bookmark" - } - ] - } -} diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/server-action-rebuild-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/server-action-rebuild-resp.json.tpl index 7d4836858390..178124d9041d 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/server-action-rebuild-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/server-action-rebuild-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/server-action-rebuild.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/server-action-rebuild.json.tpl index cceca1f210ae..b1e2cf9d9f0c 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/server-action-rebuild.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/server-action-rebuild.json.tpl @@ -2,11 +2,18 @@ "rebuild" : { "accessIPv4" : "%(access_ip_v4)s", "accessIPv6" : "%(access_ip_v6)s", + "OS-DCF:diskConfig": "AUTO", "imageRef" : "%(uuid)s", "name" : "%(name)s", "adminPass" : "%(pass)s", "metadata" : { "meta_var" : "meta_val" - } + }, + "personality": [ + { + "path": "/etc/banner.txt", + "contents": "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 b25zLiINCg0KLVJpY2hhcmQgQmFjaA==" + } + ] } } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/server-action-resize.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/server-action-resize.json.tpl index 468a88da243c..c9517c27592d 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/server-action-resize.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/server-action-resize.json.tpl @@ -1,5 +1,6 @@ { "resize" : { - "flavorRef" : "%(id)s" + "flavorRef" : "%(id)s", + "OS-DCF:diskConfig": "AUTO" } } 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 25b6415890ba..89b57dc05eee 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 @@ -7,6 +7,12 @@ "flavorRef" : "1", "metadata" : { "My Server Name" : "Apache1" - } + }, + "personality": [ + { + "path": "/etc/banner.txt", + "contents": "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 b25zLiINCg0KLVJpY2hhcmQgQmFjaA==" + } + ] } } diff --git a/nova/tests/functional/api_sample_tests/test_access_ips.py b/nova/tests/functional/api_sample_tests/test_access_ips.py index 9ac90ec05583..3feed7c38778 100644 --- a/nova/tests/functional/api_sample_tests/test_access_ips.py +++ b/nova/tests/functional/api_sample_tests/test_access_ips.py @@ -58,20 +58,3 @@ class AccessIPsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): subs['hostid'] = '[a-f0-9]+' subs['id'] = uuid self._verify_response('servers-details-resp', subs, response, 200) - - def test_servers_rebuild(self): - subs = { - 'image_id': fake.get_valid_image_id(), - 'compute_endpoint': self._get_compute_endpoint(), - 'access_ip_v4': '1.2.3.4', - 'access_ip_v6': 'fe80::' - } - uuid = self._servers_post(subs) - subs['access_ip_v4'] = "4.3.2.1" - subs['access_ip_v6'] = '80fe::' - response = self._do_post('servers/%s/action' % uuid, - 'server-action-rebuild', subs) - subs['hostid'] = '[a-f0-9]+' - subs['id'] = uuid - self._verify_response('server-action-rebuild-resp', - subs, response, 202) diff --git a/nova/tests/functional/api_sample_tests/test_disk_config.py b/nova/tests/functional/api_sample_tests/test_disk_config.py index 434dcb993add..a4a0705d217d 100644 --- a/nova/tests/functional/api_sample_tests/test_disk_config.py +++ b/nova/tests/functional/api_sample_tests/test_disk_config.py @@ -14,7 +14,6 @@ # under the License. from nova.tests.functional.api_sample_tests import test_servers -from nova.tests.unit.image import fake class DiskConfigJsonTest(test_servers.ServersSampleBase): @@ -39,27 +38,3 @@ class DiskConfigJsonTest(test_servers.ServersSampleBase): subs['access_ip_v4'] = '' subs['access_ip_v6'] = '' self._verify_response('server-get-resp', subs, response, 200) - - def test_resize_server(self): - self.flags(allow_resize_to_same_host=True) - uuid = self._post_server(use_common_server_api_samples=False) - response = self._do_post('servers/%s/action' % uuid, - 'server-resize-post-req', {}) - self.assertEqual(202, response.status_code) - # NOTE(tmello): Resize does not return response body - # Bug #1085213. - self.assertEqual("", response.content) - - def test_rebuild_server(self): - uuid = self._post_server(use_common_server_api_samples=False) - subs = { - 'image_id': fake.get_valid_image_id(), - 'compute_endpoint': self._get_compute_endpoint(), - } - response = self._do_post('servers/%s/action' % uuid, - 'server-action-rebuild-req', subs) - subs['hostid'] = '[a-f0-9]+' - subs['access_ip_v4'] = '' - subs['access_ip_v6'] = '' - self._verify_response('server-action-rebuild-resp', - subs, response, 202) diff --git a/nova/tests/functional/api_sample_tests/test_personality.py b/nova/tests/functional/api_sample_tests/test_personality.py deleted file mode 100644 index bcfa5c04b3c4..000000000000 --- a/nova/tests/functional/api_sample_tests/test_personality.py +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 2014 NEC Corporation. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from nova.tests.functional.api_sample_tests import test_servers -from nova.tests.unit.image import fake - - -class PersonalitySampleJsonTest(test_servers.ServersSampleBase): - extension_name = 'os-personality' - - def test_servers_post(self): - self._post_server(use_common_server_api_samples=False) - - def test_servers_rebuild(self): - subs = { - 'image_id': fake.get_valid_image_id(), - 'host': self._get_host(), - 'glance_host': self._get_glance_host(), - 'access_ip_v4': '1.2.3.4', - 'access_ip_v6': '80fe::' - } - uuid = self._post_server(use_common_server_api_samples=False) - response = self._do_post('servers/%s/action' % uuid, - 'server-action-rebuild-req', subs) - subs['hostid'] = '[a-f0-9]+' - subs['id'] = uuid - self._verify_response('server-action-rebuild-resp', - subs, response, 202) diff --git a/nova/tests/functional/api_sample_tests/test_servers.py b/nova/tests/functional/api_sample_tests/test_servers.py index fe07c4c353a3..77dc15f699ac 100644 --- a/nova/tests/functional/api_sample_tests/test_servers.py +++ b/nova/tests/functional/api_sample_tests/test_servers.py @@ -167,6 +167,10 @@ class ServersSampleAllExtensionJsonTest(ServersSampleJsonTest): class ServersActionsJsonTest(ServersSampleBase): sample_dir = 'servers' + # TODO(gmann): This will be removed once all API tests runs for + # all extension enable. + all_extensions = True + def _test_server_action(self, uuid, action, req_tpl, subs=None, resp_tpl=None, code=202): subs = subs or {} @@ -263,14 +267,13 @@ class ServersActionsJson219Test(ServersSampleBase): self._verify_response('server-action-rebuild-resp', subs, resp, 202) -class ServersActionsAllJsonTest(ServersActionsJsonTest): - all_extensions = True - sample_dir = None - - class ServerStartStopJsonTest(ServersSampleBase): sample_dir = 'servers' + # TODO(gmann): This will be removed once all API tests runs for + # all extension enable. + all_extensions = True + def _test_server_action(self, uuid, action, req_tpl): response = self._do_post('servers/%s/action' % uuid, req_tpl,