x
/
vmware-nsx
Code Issues Proposed changes

NSX|P: Fix loadbalancer delete cascade for pools 

When the pool is deleted the listeners were already removed.

Change-Id: I742ae44fca3c40fae4b0dc4ad577be57765c59ee
This commit is contained in:
asarfaty 2020-11-16 08:45:29 +02:00 committed by Adit Sarfaty
parent 911129771b
commit b83154df92
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vmware_nsx/services/lbaas/nsx_p/implementation/pool_mgr.py
View File

@ -240,4 +240,9 @@ class EdgePoolManagerFromDict(base_mgr.NsxpLoadbalancerBaseManager):
completor(success=True)
def delete_cascade(self, context, pool, completor):
# Listeners were already deleted
pool['listeners'] = []
pool['listener'] = None
pool['listener_id'] = None
self.delete(context, pool, completor)

8
vmware_nsx/tests/unit/services/lbaas/test_nsxp_driver.py
View File

@ -1358,16 +1358,12 @@ class TestEdgeLbaasV2Pool(BaseTestEdgeLbaasV2):
def test_delete_cascade(self):
self.reset_completor()
with mock.patch.object(self.vs_client, 'update', return_value=None
) as mock_update_virtual_server, \
mock.patch.object(self.pool_client, 'delete'
) as mock_delete_pool:
with mock.patch.object(self.pool_client, 'delete'
) as mock_delete_pool:
self.edge_driver.pool.delete_cascade(
self.context, self.pool_dict,
self.completor)
mock_update_virtual_server.assert_called_with(
LB_VS_ID, lb_persistence_profile_id=None, pool_id=None)
mock_delete_pool.assert_called_with(LB_POOL_ID)
self.assertTrue(self.last_completor_called)
self.assertTrue(self.last_completor_succees)