openstack/nova
Code Issues Proposed changes

Merge "Add API sample files of "unshelve a server" API"

Browse Source
This commit is contained in:
Jenkins
2014-03-20 23:17:35 +00:00
committed by Gerrit Code Review
parent ce075eb21c ccb68ab1cd
commit 0c97da1d42
14 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/api_samples/os-shelve/os-shelve-offload.json Normal file
View File

@@ -0,0 +1,3 @@
{
"shelveOffload": null
}

2
doc/api_samples/os-shelve/os-shelve-offload.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<shelveOffload/>

3
doc/api_samples/os-shelve/os-unshelve.json Normal file
View File

@@ -0,0 +1,3 @@
{
"unshelve": null
}

2
doc/api_samples/os-shelve/os-unshelve.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<unshelve/>

3
doc/v3/api_samples/os-shelve/os-shelve-offload.json Normal file
View File

@@ -0,0 +1,3 @@
{
"shelve_offload": null
}

3
doc/v3/api_samples/os-shelve/os-unshelve.json Normal file
View File

@@ -0,0 +1,3 @@
{
"unshelve": null
}

3
nova/tests/integrated/api_samples/os-shelve/os-shelve-offload.json.tpl Normal file
View File

@@ -0,0 +1,3 @@
{
"%(action)s": null
}

2
nova/tests/integrated/api_samples/os-shelve/os-shelve-offload.xml.tpl Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<%(action)s/>

3
nova/tests/integrated/api_samples/os-shelve/os-unshelve.json.tpl Normal file
View File

@@ -0,0 +1,3 @@
{
"%(action)s": null
}

2
nova/tests/integrated/api_samples/os-shelve/os-unshelve.xml.tpl Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<%(action)s/>

15
nova/tests/integrated/test_api_samples.py
View File

@@ -1182,26 +1182,25 @@ class ShelveJsonTest(ServersSampleBase):
# Don't offload instance, so we can test the offload call.
CONF.set_override('shelved_offload_time', -1)
def _test_server_action(self, uuid, action):
def _test_server_action(self, uuid, template, action):
response = self._do_post('servers/%s/action' % uuid,
'os-shelve',
{'action': action})
template, {'action': action})
self.assertEqual(response.status, 202)
self.assertEqual(response.read(), "")
def test_shelve(self):
uuid = self._post_server()
self._test_server_action(uuid, 'shelve')
self._test_server_action(uuid, 'os-shelve', 'shelve')
def test_shelve_offload(self):
uuid = self._post_server()
self._test_server_action(uuid, 'shelve')
self._test_server_action(uuid, 'shelveOffload')
self._test_server_action(uuid, 'os-shelve', 'shelve')
self._test_server_action(uuid, 'os-shelve-offload', 'shelveOffload')
def test_unshelve(self):
uuid = self._post_server()
self._test_server_action(uuid, 'shelve')
self._test_server_action(uuid, 'unshelve')
self._test_server_action(uuid, 'os-shelve', 'shelve')
self._test_server_action(uuid, 'os-unshelve', 'unshelve')
class ShelveXmlTest(ShelveJsonTest):

3
nova/tests/integrated/v3/api_samples/os-shelve/os-shelve-offload.json.tpl Normal file
View File

@@ -0,0 +1,3 @@
{
"%(action)s": null
}

3
nova/tests/integrated/v3/api_samples/os-shelve/os-unshelve.json.tpl Normal file
View File

@@ -0,0 +1,3 @@
{
"%(action)s": null
}

15
nova/tests/integrated/v3/test_shelve.py
View File

@@ -29,23 +29,22 @@ class ShelveJsonTest(test_servers.ServersSampleBase):
# Don't offload instance, so we can test the offload call.
CONF.set_override('shelved_offload_time', -1)
def _test_server_action(self, uuid, action):
def _test_server_action(self, uuid, template, action):
response = self._do_post('servers/%s/action' % uuid,
'os-shelve',
{'action': action})
template, {'action': action})
self.assertEqual(response.status, 202)
self.assertEqual(response.read(), "")
def test_shelve(self):
uuid = self._post_server()
self._test_server_action(uuid, 'shelve')
self._test_server_action(uuid, 'os-shelve', 'shelve')
def test_shelve_offload(self):
uuid = self._post_server()
self._test_server_action(uuid, 'shelve')
self._test_server_action(uuid, 'shelve_offload')
self._test_server_action(uuid, 'os-shelve', 'shelve')
self._test_server_action(uuid, 'os-shelve-offload', 'shelve_offload')
def test_unshelve(self):
uuid = self._post_server()
self._test_server_action(uuid, 'shelve')
self._test_server_action(uuid, 'unshelve')
self._test_server_action(uuid, 'os-shelve', 'shelve')
self._test_server_action(uuid, 'os-unshelve', 'unshelve')