From 8868ad47a20e942d6614c34f10c1d450b2ba81c3 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Tue, 21 Jun 2016 17:08:38 -0400 Subject: [PATCH] Skip IP addresses that fail to delete (instead of raising a 500). Change-Id: Ib30a0736277c90171e92617819ea34109481d8ad --- astara_router/drivers/ip.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/astara_router/drivers/ip.py b/astara_router/drivers/ip.py index 16bfd36..7df2e8b 100644 --- a/astara_router/drivers/ip.py +++ b/astara_router/drivers/ip.py @@ -240,7 +240,10 @@ class IPManager(base.Manager): self.up(interface) for item in (prev_set - next_set): - self.sudo(*fmt_args_delete(item)) + try: + self.sudo(*fmt_args_delete(item)) + except RuntimeError: + LOG.warning('IP could not be deleted: %s' % item) ip, prefix = item if ip.version == 4: self._delete_conntrack_state(ip)