Remove unused request API sample template
There are few POST API which does not take request body as mandatory. For example POST 'servers/%s/consoles/ For such API, functional sample tests using some empty request sample template. And doc/api_samples dir does not have such empty sample file. This commit removes those empty sample files and make _do_post() base method to make body and subs param as optional for such API. Also add one missing sample file(non empty) in doc/api_samples dir. Change-Id: I163e17a4a8253594e1768ed9b118fba63d5e08f1
This commit is contained in:
parent
76a946b6da
commit
2ac1bfa767
@ -0,0 +1,5 @@
|
||||
{
|
||||
"evacuate": {
|
||||
"adminPass": "MySecretPass"
|
||||
}
|
||||
}
|
@ -33,8 +33,7 @@ class ConsolesSamplesJsonTest(test_servers.ServersSampleBase):
|
||||
self.console = self.start_service('console', host='fake')
|
||||
|
||||
def _create_consoles(self, server_uuid):
|
||||
response = self._do_post('servers/%s/consoles' % server_uuid,
|
||||
'consoles-create-req', {})
|
||||
response = self._do_post('servers/%s/consoles' % server_uuid)
|
||||
self.assertEqual(response.status_code, 200)
|
||||
|
||||
def test_create_consoles(self):
|
||||
|
@ -60,21 +60,15 @@ class FloatingIpsTest(api_sample_base.ApiSampleTestBaseV21):
|
||||
{}, response, 200)
|
||||
|
||||
def test_floating_ips_list(self):
|
||||
self._do_post('os-floating-ips',
|
||||
'floating-ips-create-nopool-req',
|
||||
{})
|
||||
self._do_post('os-floating-ips',
|
||||
'floating-ips-create-nopool-req',
|
||||
{})
|
||||
self._do_post('os-floating-ips')
|
||||
self._do_post('os-floating-ips')
|
||||
|
||||
response = self._do_get('os-floating-ips')
|
||||
self._verify_response('floating-ips-list-resp',
|
||||
{}, response, 200)
|
||||
|
||||
def test_floating_ips_create_nopool(self):
|
||||
response = self._do_post('os-floating-ips',
|
||||
'floating-ips-create-nopool-req',
|
||||
{})
|
||||
response = self._do_post('os-floating-ips')
|
||||
self._verify_response('floating-ips-create-resp',
|
||||
{}, response, 200)
|
||||
|
||||
|
@ -495,12 +495,14 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase):
|
||||
return jsonutils.loads(response.content)
|
||||
return response
|
||||
|
||||
def _do_post(self, url, name, subs, method='POST', headers=None):
|
||||
self.subs = subs
|
||||
body = self._read_template(name) % self.subs
|
||||
sample = self._get_sample(name, self.microversion)
|
||||
if self.generate_samples and not os.path.exists(sample):
|
||||
self._write_sample(name, body)
|
||||
def _do_post(self, url, name=None, subs=None, method='POST', headers=None):
|
||||
self.subs = {} if subs is None else subs
|
||||
body = None
|
||||
if name:
|
||||
body = self._read_template(name) % self.subs
|
||||
sample = self._get_sample(name, self.microversion)
|
||||
if self.generate_samples and not os.path.exists(sample):
|
||||
self._write_sample(name, body)
|
||||
return self._get_response(url, method, body, headers=headers)
|
||||
|
||||
def _do_put(self, url, name=None, subs=None, headers=None):
|
||||
|
Loading…
x
Reference in New Issue
Block a user