lib: add definitions for vrf xpaths

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>

diff --git a/lib/vrf.c b/lib/vrf.c
index 136938783f000acdfd968089ef8686c7b5ae070d..0a91f4bc8653de5a76fa536525eb66b0c3d069af 100644 (file)
--- a/lib/vrf.c
+++ b/lib/vrf.c
@@ -686,8 +686,8 @@ int vrf_handler_create(struct vty *vty, const char *vrfname,
        }
 
        if (vty) {
-               snprintf(xpath_list, sizeof(xpath_list),
-                        "/frr-vrf:lib/vrf[name='%s']", vrfname);
+               snprintf(xpath_list, sizeof(xpath_list), FRR_VRF_KEY_XPATH,
+                        vrfname);
 
                nb_cli_enqueue_change(vty, xpath_list, NB_OP_CREATE, NULL);
                ret = nb_cli_apply_changes(vty, xpath_list);
@@ -821,8 +821,7 @@ DEFUN_YANG (no_vrf,
                return CMD_WARNING_CONFIG_FAILED;
        }
 
-       snprintf(xpath_list, sizeof(xpath_list), "/frr-vrf:lib/vrf[name='%s']",
-                vrfname);
+       snprintf(xpath_list, sizeof(xpath_list), FRR_VRF_KEY_XPATH, vrfname);
 
        nb_cli_enqueue_change(vty, xpath_list, NB_OP_DESTROY, NULL);
        return nb_cli_apply_changes(vty, xpath_list);

diff --git a/lib/vrf.h b/lib/vrf.h
index 32e6fb428957653ad5e8c10157781cea46c4c144..333d68ce96a154edb2c20e33ce5b7439a95d94a5 100644 (file)
--- a/lib/vrf.h
+++ b/lib/vrf.h
@@ -52,6 +52,9 @@ enum { IFLA_VRF_UNSPEC, IFLA_VRF_TABLE, __IFLA_VRF_MAX };
 #define VRF_ALL_CMD_HELP_STR    "Specify the VRF\nAll VRFs\n"
 #define VRF_FULL_CMD_HELP_STR   "Specify the VRF\nThe VRF name\nAll VRFs\n"
 
+#define FRR_VRF_XPATH "/frr-vrf:lib/vrf"
+#define FRR_VRF_KEY_XPATH "/frr-vrf:lib/vrf[name='%s']"
+
 /*
  * Pass some OS specific data up through
  * to the daemons