Merge pull request #6247 from FRRouting/nb_conversions

Merge nb_converions branch to master

babeld/babel_main.c

@@ -136,10 +136,10 @@ struct option longopts[] =
     { 0 }
   };
 
-static const struct frr_yang_module_info *const babeld_yang_modules[] =
-  {
-    &frr_interface_info,
-  };
+static const struct frr_yang_module_info *const babeld_yang_modules[] = {
+	&frr_interface_info,
+	&frr_vrf_info,
+};
 
 FRR_DAEMON_INFO(babeld, BABELD,
 		.vty_port = BABEL_VTY_PORT,

bfdd/bfdd.c

@@ -113,6 +113,7 @@ static struct quagga_signal_t bfd_signals[] = {
 static const struct frr_yang_module_info *const bfdd_yang_modules[] = {
 	&frr_interface_info,
 	&frr_bfdd_info,
+	&frr_vrf_info,
 };
 
 FRR_DAEMON_INFO(bfdd, BFD, .vty_port = 2617,

bgpd/bgp_main.c

@@ -361,6 +361,7 @@ static void bgp_vrf_terminate(void)
 static const struct frr_yang_module_info *const bgpd_yang_modules[] = {
 	&frr_interface_info,
 	&frr_route_map_info,
+	&frr_vrf_info,
 };
 
 FRR_DAEMON_INFO(bgpd, BGP, .vty_port = BGP_VTY_PORT,

eigrpd/eigrp_main.c

@@ -141,6 +141,7 @@ static const struct frr_yang_module_info *const eigrpd_yang_modules[] = {
 	&frr_eigrpd_info,
 	&frr_interface_info,
 	&frr_route_map_info,
+	&frr_vrf_info,
 };
 
 FRR_DAEMON_INFO(eigrpd, EIGRP, .vty_port = EIGRP_VTY_PORT,

isisd/isis_main.c

@@ -168,6 +168,7 @@ static const struct frr_yang_module_info *const isisd_yang_modules[] = {
 	&frr_isisd_info,
 #endif /* ifndef FABRICD */
 	&frr_route_map_info,
+	&frr_vrf_info,
 };
 
 #ifdef FABRICD

ldpd/ldpd.c

@@ -180,6 +180,7 @@ static struct quagga_signal_t ldp_signals[] =
 };
 
 static const struct frr_yang_module_info *const ldpd_yang_modules[] = {
+	&frr_vrf_info,
 };
 
 FRR_DAEMON_INFO(ldpd, LDP,

lib/if.c

@@ -1667,8 +1667,97 @@ static int lib_interface_description_destroy(enum nb_event event,
 	return NB_OK;
 }
 
-/* clang-format off */
+/*
+ * XPath: /frr-interface:lib/interface/state/if-index
+ */
+struct yang_data *lib_interface_state_if_index_get_elem(const char *xpath,
+							const void *list_entry)
+{
+	const struct interface *ifp = list_entry;
+
+	return yang_data_new_int32(xpath, ifp->ifindex);
+}
+
+/*
+ * XPath: /frr-interface:lib/interface/state/mtu
+ */
+struct yang_data *lib_interface_state_mtu_get_elem(const char *xpath,
+						   const void *list_entry)
+{
+	const struct interface *ifp = list_entry;
+
+	return yang_data_new_uint16(xpath, ifp->mtu);
+}
+
+/*
+ * XPath: /frr-interface:lib/interface/state/mtu6
+ */
+struct yang_data *lib_interface_state_mtu6_get_elem(const char *xpath,
+						    const void *list_entry)
+{
+	const struct interface *ifp = list_entry;
+
+	return yang_data_new_uint32(xpath, ifp->mtu6);
+}
+
+/*
+ * XPath: /frr-interface:lib/interface/state/speed
+ */
+struct yang_data *lib_interface_state_speed_get_elem(const char *xpath,
+						     const void *list_entry)
+{
+	const struct interface *ifp = list_entry;
+
+	return yang_data_new_uint32(xpath, ifp->speed);
+}
+
+/*
+ * XPath: /frr-interface:lib/interface/state/metric
+ */
+struct yang_data *lib_interface_state_metric_get_elem(const char *xpath,
+						      const void *list_entry)
+{
+	const struct interface *ifp = list_entry;
+
+	return yang_data_new_uint32(xpath, ifp->metric);
+}
+
+/*
+ * XPath: /frr-interface:lib/interface/state/flags
+ */
+struct yang_data *lib_interface_state_flags_get_elem(const char *xpath,
+						     const void *list_entry)
+{
+	/* TODO: implement me. */
+	return NULL;
+}
+
+/*
+ * XPath: /frr-interface:lib/interface/state/type
+ */
+struct yang_data *lib_interface_state_type_get_elem(const char *xpath,
+						    const void *list_entry)
+{
+	/* TODO: implement me. */
+	return NULL;
+}
+
+/*
+ * XPath: /frr-interface:lib/interface/state/phy-address
+ */
+struct yang_data *
+lib_interface_state_phy_address_get_elem(const char *xpath,
+					 const void *list_entry)
+{
+	const struct interface *ifp = list_entry;
+	struct ethaddr macaddr;
+
+	memcpy(&macaddr.octet, ifp->hw_addr, ETH_ALEN);
+
+	return yang_data_new_mac(xpath, &macaddr);
+}
 
+/* clang-format off */
 const struct frr_yang_module_info frr_interface_info = {
 	.name = "frr-interface",
 	.nodes = {
@@ -1691,6 +1780,54 @@ const struct frr_yang_module_info frr_interface_info = {
 				.cli_show = cli_show_interface_desc,
 			},
 		},
+		{
+			.xpath = "/frr-interface:lib/interface/state/if-index",
+			.cbs = {
+				.get_elem = lib_interface_state_if_index_get_elem,
+			}
+		},
+		{
+			.xpath = "/frr-interface:lib/interface/state/mtu",
+			.cbs = {
+				.get_elem = lib_interface_state_mtu_get_elem,
+			}
+		},
+		{
+			.xpath = "/frr-interface:lib/interface/state/mtu6",
+			.cbs = {
+				.get_elem = lib_interface_state_mtu6_get_elem,
+			}
+		},
+		{
+			.xpath = "/frr-interface:lib/interface/state/speed",
+			.cbs = {
+				.get_elem = lib_interface_state_speed_get_elem,
+			}
+		},
+		{
+			.xpath = "/frr-interface:lib/interface/state/metric",
+			.cbs = {
+				.get_elem = lib_interface_state_metric_get_elem,
+			}
+		},
+		{
+			.xpath = "/frr-interface:lib/interface/state/flags",
+			.cbs = {
+				.get_elem = lib_interface_state_flags_get_elem,
+			}
+		},
+		{
+			.xpath = "/frr-interface:lib/interface/state/type",
+			.cbs = {
+				.get_elem = lib_interface_state_type_get_elem,
+			}
+		},
+		{
+			.xpath = "/frr-interface:lib/interface/state/phy-address",
+			.cbs = {
+				.get_elem = lib_interface_state_phy_address_get_elem,
+			}
+		},
 		{
 			.xpath = NULL,
 		},

lib/if.h

@@ -602,6 +602,24 @@ extern void if_destroy_via_zapi(struct interface *ifp);
 
 extern const struct frr_yang_module_info frr_interface_info;
 
+struct yang_data *lib_interface_state_if_index_get_elem(const char *xpath,
+							const void *list_entry);
+struct yang_data *lib_interface_state_mtu_get_elem(const char *xpath,
+						   const void *list_entry);
+struct yang_data *lib_interface_state_mtu6_get_elem(const char *xpath,
+						    const void *list_entry);
+struct yang_data *lib_interface_state_speed_get_elem(const char *xpath,
+						     const void *list_entry);
+struct yang_data *lib_interface_state_metric_get_elem(const char *xpath,
+						      const void *list_entry);
+struct yang_data *lib_interface_state_flags_get_elem(const char *xpath,
+						     const void *list_entry);
+struct yang_data *lib_interface_state_type_get_elem(const char *xpath,
+						    const void *list_entry);
+struct yang_data *
+lib_interface_state_phy_address_get_elem(const char *xpath,
+					 const void *list_entry);
+
 #ifdef __cplusplus
 }
 #endif

lib/subdir.am

@@ -113,8 +113,13 @@ nodist_lib_libfrr_la_SOURCES = \
 	yang/frr-interface.yang.c \
 	yang/frr-route-map.yang.c \
 	yang/frr-route-types.yang.c \
+	yang/frr-vrf.yang.c \
+	yang/frr-routing.yang.c \
 	yang/ietf/ietf-routing-types.yang.c \
+	yang/ietf/ietf-interfaces.yang.c \
 	yang/frr-module-translator.yang.c \
+	yang/frr-nexthop.yang.c \
+	yang/frr-igmp.yang.c \
 	# end
 
 vtysh_scan += \