openstack/octavia
Code Issues Proposed changes

Add API alias for '/statuses'

Browse Source 
Fixes a neutron-lbaas LBaaS v2 API compatibility issue when requesting a
load balancer status tree via '/statuses'. This patch adds an alias for
'/statuses' to use the same code as '/status'.

Change-Id: I7aebf87c5f48e2e72b1f7f26b95663a861382f36
Story: 2001812
Task: 12547
This commit is contained in:
Michael Johnson 2018-04-10 16:39:42 -07:00
parent 1f278e7ab3
commit 922c79f52f
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
octavia/api/v2/controllers/load_balancer.py
View File

@ -483,15 +483,19 @@ class LoadBalancersController(base.BaseController):
def _lookup(self, id, *remainder): def _lookup(self, id, *remainder):
"""Overridden pecan _lookup method for custom routing. """Overridden pecan _lookup method for custom routing.
Currently it checks if this was a statuses request and routes Currently it checks if this was a status request and routes
the request to the StatusesController. the request to the StatusController.
'statuses' is aliased here for backward compatibility with
neutron-lbaas LBaaS v2 API.
""" """
if id and len(remainder) and (remainder[0] == 'status' or if id and len(remainder) and (remainder[0] == 'status' or
remainder[0] == 'statuses' or
remainder[0] == 'stats' or remainder[0] == 'stats' or
remainder[0] == 'failover'): remainder[0] == 'failover'):
controller = remainder[0] controller = remainder[0]
remainder = remainder[1:] remainder = remainder[1:]
if controller == 'status': if controller == 'status' or controller == 'statuses':
return StatusController(lb_id=id), remainder return StatusController(lb_id=id), remainder
elif controller == 'stats': elif controller == 'stats':
return StatisticsController(lb_id=id), remainder return StatisticsController(lb_id=id), remainder

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

@ -2436,10 +2436,25 @@ class TestLoadBalancerGraph(base.BaseAPITest):
res = self.get(self.LB_PATH.format(lb_id=lb_id + "/status")) res = self.get(self.LB_PATH.format(lb_id=lb_id + "/status"))
return res.json.get('statuses').get('loadbalancer') return res.json.get('statuses').get('loadbalancer')
# Test the "statuses" alias for "status".
# This is required for backward compatibility with neutron-lbaas
def test_statuses(self): def test_statuses(self):
lb = self.create_load_balancer( lb = self.create_load_balancer(
uuidutils.generate_uuid()).get('loadbalancer') uuidutils.generate_uuid()).get('loadbalancer')
statuses = self.get(self.LB_PATH.format(lb_id=lb['id'] + "/statuses"))
response = statuses.json.get('statuses').get('loadbalancer')
self.assertEqual(lb['name'], response['name'])
self.assertEqual(lb['id'], response['id'])
self.assertEqual(lb['operating_status'],
response['operating_status'])
self.assertEqual(lb['provisioning_status'],
response['provisioning_status'])
def test_status(self):
lb = self.create_load_balancer(
uuidutils.generate_uuid()).get('loadbalancer')
response = self._getStatus(lb['id']) response = self._getStatus(lb['id'])
self.assertEqual(lb['name'], response['name']) self.assertEqual(lb['name'], response['name'])
self.assertEqual(lb['id'], response['id']) self.assertEqual(lb['id'], response['id'])

5
releasenotes/notes/statuses_alias-27559e3d74b9eaf0.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fixes a neutron-lbaas LBaaS v2 API compatibility issue when requesting a
load balancer status tree via '/statuses'.