openstack
/
octavia
Code Issues Proposed changes

Merge "Fix v2 LB API return for null description and name"

This commit is contained in:
Jenkins 2017-03-22 22:08:22 +00:00 committed by Gerrit Code Review
parent 60300332ca ae2e13fe5a
commit a25dc0d7dc
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
octavia/api/v2/types/load_balancer.py
View File

@ -54,6 +54,11 @@ class LoadBalancerResponse(BaseLoadBalancerType):
result.vip_address = data_model.vip.ip_address
result.vip_network_id = data_model.vip.network_id
result.tenant_id = data_model.project_id
if not result.description:
result.description = ""
if not result.name:
result.name = ""
return result

12
octavia/tests/functional/api/v2/test_load_balancer.py
View File

@ -31,8 +31,16 @@ class TestLoadBalancer(base.BaseAPITest):
def _assert_request_matches_response(self, req, resp, **optionals):
self.assertTrue(uuidutils.is_uuid_like(resp.get('id')))
self.assertEqual(req.get('name'), resp.get('name'))
self.assertEqual(req.get('description'), resp.get('description'))
req_name = req.get('name')
req_description = req.get('description')
if not req_name:
self.assertEqual('', resp.get('name'))
else:
self.assertEqual(req.get('name'), resp.get('name'))
if not req_description:
self.assertEqual('', resp.get('description'))
else:
self.assertEqual(req.get('description'), resp.get('description'))
self.assertEqual(constants.PENDING_CREATE,
resp.get('provisioning_status'))
self.assertEqual(constants.OFFLINE, resp.get('operating_status'))