Merge "Return DELETED status when deleting a nonexistent member"

Author: Zuul

ovn_octavia_provider/helper.py

@@ -2185,9 +2185,7 @@ def _remove_member(self, member, ovn_lb, pool_key):
             return pool_status
         else:
             msg = f"Member {member[constants.ID]} not found in the pool"
-            raise driver_exceptions.DriverError(
-                user_fault_string=msg,
-                operator_fault_string=msg)
+            LOG.warning(msg)
 
     def _members_in_subnet(self, ovn_lb, subnet_id):
         for key, value in ovn_lb.external_ids.items():

ovn_octavia_provider/tests/unit/test_helper.py

@@ -2212,14 +2212,16 @@ def test_member_delete_not_found_in_pool(self):
         self.assertEqual(status['pools'][0]['provisioning_status'],
                          constants.ACTIVE)
         self.assertEqual(status['members'][0]['provisioning_status'],
-                         constants.ERROR)
+                         constants.DELETED)
 
     @mock.patch.object(ovn_helper.OvnProviderHelper, '_remove_member')
     def test_member_delete_exception(self, mock_remove_member):
         mock_remove_member.side_effect = [RuntimeError]
         status = self.helper.member_delete(self.member)
         self.assertEqual(status['pools'][0]['provisioning_status'],
                          constants.ACTIVE)
+        self.assertEqual(status['members'][0]['provisioning_status'],
+                         constants.ERROR)
 
     def test_member_delete_disabled_lb(self):
         self.helper._find_ovn_lb_with_pool_key.side_effect = [