openstack
/
octavia
Code Issues Proposed changes

Merge "Fix LB failover for amphorav2: set security group" into stable/ussuri

This commit is contained in:
Zuul 2021-05-17 08:57:11 +00:00 committed by Gerrit Code Review
parent 46b9ce7cde 7ded0e47c5
commit 7a4e04c809
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
octavia/controller/worker/v2/tasks/network_tasks.py
View File

@ -405,7 +405,7 @@ class UpdateVIPSecurityGroup(BaseNetworkTask):
LOG.debug("Setup SG for loadbalancer id: %s", loadbalancer_id) LOG.debug("Setup SG for loadbalancer id: %s", loadbalancer_id)
db_lb = self.loadbalancer_repo.get( db_lb = self.loadbalancer_repo.get(
db_apis.get_session(), id=loadbalancer_id) db_apis.get_session(), id=loadbalancer_id)
self.network_driver.update_vip_sg(db_lb, db_lb.vip) return self.network_driver.update_vip_sg(db_lb, db_lb.vip)
class GetSubnetFromVIP(BaseNetworkTask): class GetSubnetFromVIP(BaseNetworkTask):

5
octavia/tests/unit/controller/worker/v1/tasks/test_network_tasks.py
View File

@ -34,6 +34,7 @@ COMPUTE_ID = uuidutils.generate_uuid()
PORT_ID = uuidutils.generate_uuid() PORT_ID = uuidutils.generate_uuid()
SUBNET_ID = uuidutils.generate_uuid() SUBNET_ID = uuidutils.generate_uuid()
NETWORK_ID = uuidutils.generate_uuid() NETWORK_ID = uuidutils.generate_uuid()
SG_ID = uuidutils.generate_uuid()
IP_ADDRESS = "172.24.41.1" IP_ADDRESS = "172.24.41.1"
VIP = o_data_models.Vip(port_id=t_constants.MOCK_PORT_ID, VIP = o_data_models.Vip(port_id=t_constants.MOCK_PORT_ID,
subnet_id=t_constants.MOCK_SUBNET_ID, subnet_id=t_constants.MOCK_SUBNET_ID,
@ -868,15 +869,17 @@ class TestNetworkTasks(base.TestCase):
def test_update_vip_sg(self, mock_lb_get, mock_get_session, def test_update_vip_sg(self, mock_lb_get, mock_get_session,
mock_get_net_driver): mock_get_net_driver):
mock_driver = mock.MagicMock() mock_driver = mock.MagicMock()
mock_driver.update_vip_sg.return_value = SG_ID
mock_get_net_driver.return_value = mock_driver mock_get_net_driver.return_value = mock_driver
mock_lb_get.return_value = self.load_balancer_mock mock_lb_get.return_value = self.load_balancer_mock
net = network_tasks.UpdateVIPSecurityGroup() net = network_tasks.UpdateVIPSecurityGroup()
net.execute(self.load_balancer_mock.id) sg_id = net.execute(self.load_balancer_mock.id)
mock_lb_get.assert_called_once_with('TEST', mock_lb_get.assert_called_once_with('TEST',
id=self.load_balancer_mock.id) id=self.load_balancer_mock.id)
mock_driver.update_vip_sg.assert_called_once_with( mock_driver.update_vip_sg.assert_called_once_with(
self.load_balancer_mock, self.load_balancer_mock.vip) self.load_balancer_mock, self.load_balancer_mock.vip)
self.assertEqual(sg_id, SG_ID)
def test_get_subnet_from_vip(self, mock_get_net_driver): def test_get_subnet_from_vip(self, mock_get_net_driver):
mock_driver = mock.MagicMock() mock_driver = mock.MagicMock()

5
octavia/tests/unit/controller/worker/v2/tasks/test_network_tasks.py
View File

@ -36,6 +36,7 @@ COMPUTE_ID = uuidutils.generate_uuid()
PORT_ID = uuidutils.generate_uuid() PORT_ID = uuidutils.generate_uuid()
SUBNET_ID = uuidutils.generate_uuid() SUBNET_ID = uuidutils.generate_uuid()
NETWORK_ID = uuidutils.generate_uuid() NETWORK_ID = uuidutils.generate_uuid()
SG_ID = uuidutils.generate_uuid()
IP_ADDRESS = "172.24.41.1" IP_ADDRESS = "172.24.41.1"
VIP = o_data_models.Vip(port_id=t_constants.MOCK_PORT_ID, VIP = o_data_models.Vip(port_id=t_constants.MOCK_PORT_ID,
subnet_id=t_constants.MOCK_SUBNET_ID, subnet_id=t_constants.MOCK_SUBNET_ID,
@ -985,12 +986,14 @@ class TestNetworkTasks(base.TestCase):
def test_update_vip_sg(self, mock_session, mock_lb_get, def test_update_vip_sg(self, mock_session, mock_lb_get,
mock_get_net_driver): mock_get_net_driver):
mock_driver = mock.MagicMock() mock_driver = mock.MagicMock()
mock_driver.update_vip_sg.return_value = SG_ID
mock_lb_get.return_value = LB mock_lb_get.return_value = LB
mock_get_net_driver.return_value = mock_driver mock_get_net_driver.return_value = mock_driver
net = network_tasks.UpdateVIPSecurityGroup() net = network_tasks.UpdateVIPSecurityGroup()
net.execute(self.load_balancer_mock) sg_id = net.execute(self.load_balancer_mock)
mock_driver.update_vip_sg.assert_called_once_with(LB, LB.vip) mock_driver.update_vip_sg.assert_called_once_with(LB, LB.vip)
self.assertEqual(sg_id, SG_ID)
def test_get_subnet_from_vip(self, mock_get_net_driver): def test_get_subnet_from_vip(self, mock_get_net_driver):
mock_driver = mock.MagicMock() mock_driver = mock.MagicMock()

5
releasenotes/notes/fix-amphorav2-failover-secgroup-c793de5e00b32653.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fixed an issue that an amphorav2 LB cannot be reached after loadbalancer
failover. The LB security group was not set in the amphora port.