Merge pull request #4765 from opensourcerouting/defaults-v2

[mirror_frr.git] / pbrd / pbr_zebra.c

diff --git a/pbrd/pbr_zebra.c b/pbrd/pbr_zebra.c
index b0a689a7e4b428edeb3ba075e3bcce6cff5c9bb8..06ad0f40a47a4fe71e00f028e56e5926f346dcb8 100644 (file)
--- a/pbrd/pbr_zebra.c
+++ b/pbrd/pbr_zebra.c
@@ -234,23 +234,21 @@ static int rule_notify_owner(ZAPI_CALLBACK_ARGS)
        switch (note) {
        case ZAPI_RULE_FAIL_INSTALL:
                pbrms->installed &= ~installed;
-               DEBUGD(&pbr_dbg_zebra,
-                      "%s: Received RULE_FAIL_INSTALL: %" PRIu64,
-                      __PRETTY_FUNCTION__, pbrms->installed);
                break;
        case ZAPI_RULE_INSTALLED:
                pbrms->installed |= installed;
-               DEBUGD(&pbr_dbg_zebra, "%s: Received RULE_INSTALLED: %" PRIu64,
-                      __PRETTY_FUNCTION__, pbrms->installed);
                break;
        case ZAPI_RULE_FAIL_REMOVE:
+               /* Don't change state on rule removal failure */
+               break;
        case ZAPI_RULE_REMOVED:
                pbrms->installed &= ~installed;
-               DEBUGD(&pbr_dbg_zebra, "%s: Received RULE REMOVED: %" PRIu64,
-                      __PRETTY_FUNCTION__, pbrms->installed);
                break;
        }
 
+       DEBUGD(&pbr_dbg_zebra, "%s: Received %s: %" PRIu64, __func__,
+              zapi_rule_notify_owner2str(note), pbrms->installed);
+
        pbr_map_final_interface_deletion(pbrms->parent, pmi);
 
        return 0;