openstack
/
octavia
Code Issues Proposed changes

Merge "LB Admin down should show operating_status OFFLINE"

This commit is contained in:
Jenkins 2017-08-10 19:14:17 +00:00 committed by Gerrit Code Review
parent 956291a0f7 7e211cfead
commit 4878e909f8
2 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
octavia/controller/healthmanager/update_db.py
View File

@ -121,7 +121,11 @@ class UpdateHealthDb(object):
'expected': expected_listener_count})
# We got a heartbeat so lb is healthy until proven otherwise
lb_status = constants.ONLINE
# TODO(johnsom) Fix this if we have more than one LB on an amp
if lbs_on_amp[0].enabled is False:
lb_status = constants.OFFLINE
else:
lb_status = constants.ONLINE
# update listener and nodes db information
for listener_id, listener in listeners.items():

48
octavia/tests/unit/controller/healthmanager/test_update_db.py
View File

@ -605,6 +605,54 @@ class TestUpdateHealthDb(base.TestCase):
self.pool_repo.update.assert_not_called()
self.member_repo.update.assert_not_called()
def test_update_health_lb_admin_down(self):
health = {
"id": self.FAKE_UUID_1,
"listeners": {}}
fake_lb = mock.MagicMock()
fake_lb.enabled = False
self.hm.amphora_repo.get_all_lbs_on_amphora.return_value = [fake_lb]
lb = mock.MagicMock()
lb.operating_status.lower.return_value = 'blah'
self.amphora_repo.get.load_balancer_id.return_value = self.FAKE_UUID_1
self.loadbalancer_repo.get.return_value = lb
self.hm.update_health(health)
self.assertTrue(self.amphora_repo.get.called)
self.assertTrue(lb.operating_status.lower.called)
self.assertTrue(self.loadbalancer_repo.update.called)
self.loadbalancer_repo.update.assert_called_with(
self.mock_session(),
self.amphora_repo.get().load_balancer_id,
operating_status='OFFLINE')
def test_update_health_lb_admin_up(self):
health = {
"id": self.FAKE_UUID_1,
"listeners": {}}
fake_lb = mock.MagicMock()
fake_lb.enabled = True
self.hm.amphora_repo.get_all_lbs_on_amphora.return_value = [fake_lb]
lb = mock.MagicMock()
lb.operating_status.lower.return_value = 'blah'
self.amphora_repo.get.load_balancer_id.return_value = self.FAKE_UUID_1
self.loadbalancer_repo.get.return_value = lb
self.hm.update_health(health)
self.assertTrue(self.amphora_repo.get.called)
self.assertTrue(lb.operating_status.lower.called)
self.assertTrue(self.loadbalancer_repo.update.called)
self.loadbalancer_repo.update.assert_called_with(
self.mock_session(),
self.amphora_repo.get().load_balancer_id,
operating_status='ONLINE')
class TestUpdateStatsDb(base.TestCase):