pim6d: moving FRR_PIM_AF_XPATH_VAL into pim_nb.h

Signed-off-by: sarita patra <saritap@vmware.com>

diff --git a/pimd/pim_addr.h b/pimd/pim_addr.h
index a278a465936dd21f94802470287c3e4b0af0e25d..e422a2e2da4364f27c0343c279def0bddf7a6a52 100644 (file)
--- a/pimd/pim_addr.h
+++ b/pimd/pim_addr.h
@@ -33,7 +33,6 @@ typedef struct in_addr pim_addr;
 #define PIM_AFI                AFI_IP
 #define PIM_MAX_BITLEN IPV4_MAX_BITLEN
 #define PIM_AF_NAME     "ip"
-#define        FRR_PIM_AF_XPATH_VAL "frr-routing:ipv4"
 
 union pimprefixptr {
        prefixtype(pimprefixptr, struct prefix,      p)
@@ -53,7 +52,6 @@ typedef struct in6_addr pim_addr;
 #define PIM_AFI                AFI_IP6
 #define PIM_MAX_BITLEN IPV6_MAX_BITLEN
 #define PIM_AF_NAME     "ipv6"
-#define        FRR_PIM_AF_XPATH_VAL "frr-routing:ipv6"
 
 union pimprefixptr {
        prefixtype(pimprefixptr, struct prefix,      p)

diff --git a/pimd/pim_nb.h b/pimd/pim_nb.h
index 72c96d7d7309fb5af9e00fd94290afce47ba8154..273c7e8a6101ef56fdf34739538cdba69887af10 100644 (file)
--- a/pimd/pim_nb.h
+++ b/pimd/pim_nb.h
@@ -198,6 +198,12 @@ int lib_interface_gmp_address_family_static_group_destroy(
 int routing_control_plane_protocols_name_validate(
        struct nb_cb_create_args *args);
 
+#if PIM_IPV == 4
+#define FRR_PIM_AF_XPATH_VAL "frr-routing:ipv4"
+#else
+#define FRR_PIM_AF_XPATH_VAL "frr-routing:ipv6"
+#endif
+
 #define FRR_PIM_VRF_XPATH                                               \
        "/frr-routing:routing/control-plane-protocols/"                 \
        "control-plane-protocol[type='%s'][name='%s'][vrf='%s']/"       \