x/deb-python-tempest-lib
Code Issues Proposed changes

Merge "Fix fixed_ip schema and service client"

Browse Source
This commit is contained in:
Jenkins
2015-12-02 23:35:24 +00:00
committed by Gerrit Code Review
parent 0e412f2e6c 2a6da4a5cd
commit ca166499b5
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tempest_lib/api_schema/response/compute/v2_1/fixed_ips.py
View File

@@ -36,7 +36,6 @@ get_fixed_ip = {
}
}
reserve_fixed_ip = {
'status_code': [202],
'response_body': {'type': 'string'}
reserve_unreserve_fixed_ip = {
'status_code': [202]
}

4
tempest_lib/services/compute/fixed_ips_client.py
View File

@@ -32,5 +32,5 @@ class FixedIPsClient(rest_client.RestClient):
"""This reserves and unreserves fixed ips."""
url = "os-fixed-ips/%s/action" % fixed_ip
resp, body = self.post(url, json.dumps(kwargs))
self.validate_response(schema.reserve_fixed_ip, resp, body)
return rest_client.ResponseBody(resp)
self.validate_response(schema.reserve_unreserve_fixed_ip, resp, body)
return rest_client.ResponseBody(resp, body)

13
tempest_lib/tests/services/compute/test_fixedIPs_client.py
View File

@@ -43,3 +43,16 @@ class TestFixedIPsClient(base.BaseComputeServiceTest):
def test_show_fixed_ip_with_bytes_body(self):
self._test_show_fixed_ip(True)
def _test_reserve_fixed_ip(self, bytes_body=False):
self.check_service_client_function(
self.fixedIPsClient.reserve_fixed_ip,
'tempest_lib.common.rest_client.RestClient.post',
{}, bytes_body,
status=202, fixed_ip='Identifier')
def test_reserve_fixed_ip_with_str_body(self):
self._test_reserve_fixed_ip()
def test_reserve_fixed_ip_with_bytes_body(self):
self._test_reserve_fixed_ip(True)