zebra: Do not flush an existing vni configuration trying to remove wrong vni

Before:

```
pc.donatas.net(config)# do sh run | include vni
vni 1
pc.donatas.net(config)# no vni 2
pc.donatas.net(config)# do sh run | include vni
pc.donatas.net(config)#
```

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit 44fe3981ee388f7c60ab2635309bce34774116e1)

diff --git a/zebra/zebra_cli.c b/zebra/zebra_cli.c
index 3e03d7477575e29f7a3fd48e2240502ef25e3d63..4f05c56009546f45a35d8ed65c350f8d6b236ff8 100644 (file)
--- a/zebra/zebra_cli.c
+++ b/zebra/zebra_cli.c
@@ -2317,12 +2317,32 @@ DEFPY_YANG (vni_mapping,
        "VNI-ID\n"
        "prefix-routes-only\n")
 {
-       if (!no)
+       const struct lyd_node *dnode;
+       const char *vrf;
+
+       if (!no) {
                nb_cli_enqueue_change(vty, "./frr-zebra:zebra/l3vni-id", NB_OP_MODIFY,
                              vni_str);
-       else
-               nb_cli_enqueue_change(vty, "./frr-zebra:zebra/l3vni-id", NB_OP_DESTROY,
-                             NULL);
+       } else {
+               if (vty->node == CONFIG_NODE) {
+                       if (yang_dnode_existsf(vty->candidate_config->dnode,
+                                              "/frr-vrf:lib/vrf[name='%s']/frr-zebra:zebra[l3vni-id='%lu']",
+                                              VRF_DEFAULT_NAME, vni))
+                               nb_cli_enqueue_change(vty, "./frr-zebra:zebra/l3vni-id",
+                                                     NB_OP_DESTROY, NULL);
+               } else {
+                       dnode = yang_dnode_get(vty->candidate_config->dnode, VTY_CURR_XPATH);
+                       if (dnode) {
+                               vrf = yang_dnode_get_string(dnode, "name");
+
+                               if (yang_dnode_existsf(vty->candidate_config->dnode,
+                                                      "/frr-vrf:lib/vrf[name='%s']/frr-zebra:zebra[l3vni-id='%lu']",
+                                                      vrf, vni))
+                                       nb_cli_enqueue_change(vty, "./frr-zebra:zebra/l3vni-id",
+                                                             NB_OP_DESTROY, NULL);
+                       }
+               }
+       }
 
        if (filter)
                nb_cli_enqueue_change(vty, "./frr-zebra:zebra/prefix-only",