proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-06 09:00:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ripd: make YANG operational-data VRF aware too

Browse Source 
Move the "state" container into the "instance" list and adapt the code
accordingly.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
This commit is contained in:
Renato Westphal 2019-01-04 19:08:10 -02:00
parent ae7b826a23
commit 32600a9807
3 changed files with 175 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

190
ripd/rip_northbound.c
View File

@ -99,6 +99,38 @@ static int ripd_instance_delete(enum nb_event event,
return NB_OK;
}
static const void *ripd_instance_get_next(const void *parent_list_entry,
const void *list_entry)
{
const struct rip *rip = list_entry;
if (list_entry == NULL)
rip = RB_MIN(rip_instance_head, &rip_instances);
else
rip = RB_NEXT(rip_instance_head, (struct rip *)rip);
return rip;
}
static int ripd_instance_get_keys(const void *list_entry,
struct yang_list_keys *keys)
{
const struct rip *rip = list_entry;
keys->num = 1;
strlcpy(keys->key[0], rip->vrf_name, sizeof(keys->key[0]));
return NB_OK;
}
static const void *ripd_instance_lookup_entry(const void *parent_list_entry,
const struct yang_list_keys *keys)
{
const char *vrf_name = keys->key[0];
return rip_lookup_by_vrf_name(vrf_name);
}
/*
* XPath: /frr-ripd:ripd/instance/allow-ecmp
*/
@ -1099,19 +1131,15 @@ lib_interface_rip_authentication_key_chain_delete(enum nb_event event,
}
/*
* XPath: /frr-ripd:ripd/state/neighbors/neighbor
* XPath: /frr-ripd:ripd/instance/state/neighbors/neighbor
*/
static const void *
ripd_state_neighbors_neighbor_get_next(const void *parent_list_entry,
const void *list_entry)
ripd_instance_state_neighbors_neighbor_get_next(const void *parent_list_entry,
const void *list_entry)
{
struct rip *rip;
const struct rip *rip = parent_list_entry;
struct listnode *node;
rip = rip_lookup_by_vrf_id(VRF_DEFAULT);
if (rip == NULL)
return NULL;
if (list_entry == NULL)
node = listhead(rip->peer_list);
else
@ -1120,8 +1148,9 @@ ripd_state_neighbors_neighbor_get_next(const void *parent_list_entry,
return node;
}
static int ripd_state_neighbors_neighbor_get_keys(const void *list_entry,
struct yang_list_keys *keys)
static int
ripd_instance_state_neighbors_neighbor_get_keys(const void *list_entry,
struct yang_list_keys *keys)
{
const struct listnode *node = list_entry;
const struct rip_peer *peer = listgetdata(node);
@ -1133,21 +1162,16 @@ static int ripd_state_neighbors_neighbor_get_keys(const void *list_entry,
return NB_OK;
}
static const void *
ripd_state_neighbors_neighbor_lookup_entry(const void *parent_list_entry,
const struct yang_list_keys *keys)
static const void *ripd_instance_state_neighbors_neighbor_lookup_entry(
const void *parent_list_entry, const struct yang_list_keys *keys)
{
struct rip *rip;
const struct rip *rip = parent_list_entry;
struct in_addr address;
struct rip_peer *peer;
struct listnode *node;
yang_str2ipv4(keys->key[0], &address);
rip = rip_lookup_by_vrf_id(VRF_DEFAULT);
if (rip == NULL)
return NULL;
for (ALL_LIST_ELEMENTS_RO(rip->peer_list, node, peer)) {
if (IPV4_ADDR_SAME(&peer->addr, &address))
return node;
@ -1157,11 +1181,11 @@ ripd_state_neighbors_neighbor_lookup_entry(const void *parent_list_entry,
}
/*
* XPath: /frr-ripd:ripd/state/neighbors/neighbor/address
* XPath: /frr-ripd:ripd/instance/state/neighbors/neighbor/address
*/
static struct yang_data *
ripd_state_neighbors_neighbor_address_get_elem(const char *xpath,
const void *list_entry)
ripd_instance_state_neighbors_neighbor_address_get_elem(const char *xpath,
const void *list_entry)
{
const struct listnode *node = list_entry;
const struct rip_peer *peer = listgetdata(node);
@ -1170,22 +1194,22 @@ ripd_state_neighbors_neighbor_address_get_elem(const char *xpath,
}
/*
* XPath: /frr-ripd:ripd/state/neighbors/neighbor/last-update
* XPath: /frr-ripd:ripd/instance/state/neighbors/neighbor/last-update
*/
static struct yang_data *
ripd_state_neighbors_neighbor_last_update_get_elem(const char *xpath,
const void *list_entry)
ripd_instance_state_neighbors_neighbor_last_update_get_elem(
const char *xpath, const void *list_entry)
{
/* TODO: yang:date-and-time is tricky */
return NULL;
}
/*
* XPath: /frr-ripd:ripd/state/neighbors/neighbor/bad-packets-rcvd
* XPath: /frr-ripd:ripd/instance/state/neighbors/neighbor/bad-packets-rcvd
*/
static struct yang_data *
ripd_state_neighbors_neighbor_bad_packets_rcvd_get_elem(const char *xpath,
const void *list_entry)
ripd_instance_state_neighbors_neighbor_bad_packets_rcvd_get_elem(
const char *xpath, const void *list_entry)
{
const struct listnode *node = list_entry;
const struct rip_peer *peer = listgetdata(node);
@ -1194,11 +1218,11 @@ ripd_state_neighbors_neighbor_bad_packets_rcvd_get_elem(const char *xpath,
}
/*
* XPath: /frr-ripd:ripd/state/neighbors/neighbor/bad-routes-rcvd
* XPath: /frr-ripd:ripd/instance/state/neighbors/neighbor/bad-routes-rcvd
*/
static struct yang_data *
ripd_state_neighbors_neighbor_bad_routes_rcvd_get_elem(const char *xpath,
const void *list_entry)
ripd_instance_state_neighbors_neighbor_bad_routes_rcvd_get_elem(
const char *xpath, const void *list_entry)
{
const struct listnode *node = list_entry;
const struct rip_peer *peer = listgetdata(node);
@ -1207,19 +1231,15 @@ ripd_state_neighbors_neighbor_bad_routes_rcvd_get_elem(const char *xpath,
}
/*
* XPath: /frr-ripd:ripd/state/routes/route
* XPath: /frr-ripd:ripd/instance/state/routes/route
*/
static const void *
ripd_state_routes_route_get_next(const void *parent_list_entry,
const void *list_entry)
ripd_instance_state_routes_route_get_next(const void *parent_list_entry,
const void *list_entry)
{
struct rip *rip;
const struct rip *rip = parent_list_entry;
struct route_node *rn;
rip = rip_lookup_by_vrf_id(VRF_DEFAULT);
if (rip == NULL)
return NULL;
if (list_entry == NULL)
rn = route_top(rip->table);
else
@ -1230,8 +1250,9 @@ ripd_state_routes_route_get_next(const void *parent_list_entry,
return rn;
}
static int ripd_state_routes_route_get_keys(const void *list_entry,
struct yang_list_keys *keys)
static int
ripd_instance_state_routes_route_get_keys(const void *list_entry,
struct yang_list_keys *keys)
{
const struct route_node *rn = list_entry;
@ -1242,19 +1263,15 @@ static int ripd_state_routes_route_get_keys(const void *list_entry,
}
static const void *
ripd_state_routes_route_lookup_entry(const void *parent_list_entry,
const struct yang_list_keys *keys)
ripd_instance_state_routes_route_lookup_entry(const void *parent_list_entry,
const struct yang_list_keys *keys)
{
struct rip *rip;
const struct rip *rip = parent_list_entry;
struct prefix prefix;
struct route_node *rn;
yang_str2ipv4p(keys->key[0], &prefix);
rip = rip_lookup_by_vrf_id(VRF_DEFAULT);
if (rip == NULL)
return NULL;
rn = route_node_lookup(rip->table, &prefix);
if (!rn || !rn->info)
return NULL;
@ -1265,11 +1282,11 @@ ripd_state_routes_route_lookup_entry(const void *parent_list_entry,
}
/*
* XPath: /frr-ripd:ripd/state/routes/route/prefix
* XPath: /frr-ripd:ripd/instance/state/routes/route/prefix
*/
static struct yang_data *
ripd_state_routes_route_prefix_get_elem(const char *xpath,
const void *list_entry)
ripd_instance_state_routes_route_prefix_get_elem(const char *xpath,
const void *list_entry)
{
const struct route_node *rn = list_entry;
const struct rip_info *rinfo = listnode_head(rn->info);
@ -1278,11 +1295,11 @@ ripd_state_routes_route_prefix_get_elem(const char *xpath,
}
/*
* XPath: /frr-ripd:ripd/state/routes/route/next-hop
* XPath: /frr-ripd:ripd/instance/state/routes/route/next-hop
*/
static struct yang_data *
ripd_state_routes_route_next_hop_get_elem(const char *xpath,
const void *list_entry)
ripd_instance_state_routes_route_next_hop_get_elem(const char *xpath,
const void *list_entry)
{
const struct route_node *rn = list_entry;
const struct rip_info *rinfo = listnode_head(rn->info);
@ -1297,31 +1314,33 @@ ripd_state_routes_route_next_hop_get_elem(const char *xpath,
}
/*
* XPath: /frr-ripd:ripd/state/routes/route/interface
* XPath: /frr-ripd:ripd/instance/state/routes/route/interface
*/
static struct yang_data *
ripd_state_routes_route_interface_get_elem(const char *xpath,
const void *list_entry)
ripd_instance_state_routes_route_interface_get_elem(const char *xpath,
const void *list_entry)
{
const struct route_node *rn = list_entry;
const struct rip_info *rinfo = listnode_head(rn->info);
const struct rip *rip = rip_info_get_instance(rinfo);
switch (rinfo->nh.type) {
case NEXTHOP_TYPE_IFINDEX:
case NEXTHOP_TYPE_IPV4_IFINDEX:
return yang_data_new_string(
xpath, ifindex2ifname(rinfo->nh.ifindex, VRF_DEFAULT));
xpath,
ifindex2ifname(rinfo->nh.ifindex, rip->vrf->vrf_id));
default:
return NULL;
}
}
/*
* XPath: /frr-ripd:ripd/state/routes/route/metric
* XPath: /frr-ripd:ripd/instance/state/routes/route/metric
*/
static struct yang_data *
ripd_state_routes_route_metric_get_elem(const char *xpath,
const void *list_entry)
ripd_instance_state_routes_route_metric_get_elem(const char *xpath,
const void *list_entry)
{
const struct route_node *rn = list_entry;
const struct rip_info *rinfo = listnode_head(rn->info);
@ -1423,6 +1442,9 @@ const struct frr_yang_module_info frr_ripd_info = {
.xpath = "/frr-ripd:ripd/instance",
.cbs.create = ripd_instance_create,
.cbs.delete = ripd_instance_delete,
.cbs.get_next = ripd_instance_get_next,
.cbs.get_keys = ripd_instance_get_keys,
.cbs.lookup_entry = ripd_instance_lookup_entry,
.cbs.cli_show = cli_show_router_rip,
},
{
@ -1607,48 +1629,48 @@ const struct frr_yang_module_info frr_ripd_info = {
.cbs.cli_show = cli_show_ip_rip_authentication_key_chain,
},
{
.xpath = "/frr-ripd:ripd/state/neighbors/neighbor",
.cbs.get_next = ripd_state_neighbors_neighbor_get_next,
.cbs.get_keys = ripd_state_neighbors_neighbor_get_keys,
.cbs.lookup_entry = ripd_state_neighbors_neighbor_lookup_entry,
.xpath = "/frr-ripd:ripd/instance/state/neighbors/neighbor",
.cbs.get_next = ripd_instance_state_neighbors_neighbor_get_next,
.cbs.get_keys = ripd_instance_state_neighbors_neighbor_get_keys,
.cbs.lookup_entry = ripd_instance_state_neighbors_neighbor_lookup_entry,
},
{
.xpath = "/frr-ripd:ripd/state/neighbors/neighbor/address",
.cbs.get_elem = ripd_state_neighbors_neighbor_address_get_elem,
.xpath = "/frr-ripd:ripd/instance/state/neighbors/neighbor/address",
.cbs.get_elem = ripd_instance_state_neighbors_neighbor_address_get_elem,
},
{
.xpath = "/frr-ripd:ripd/state/neighbors/neighbor/last-update",
.cbs.get_elem = ripd_state_neighbors_neighbor_last_update_get_elem,
.xpath = "/frr-ripd:ripd/instance/state/neighbors/neighbor/last-update",
.cbs.get_elem = ripd_instance_state_neighbors_neighbor_last_update_get_elem,
},
{
.xpath = "/frr-ripd:ripd/state/neighbors/neighbor/bad-packets-rcvd",
.cbs.get_elem = ripd_state_neighbors_neighbor_bad_packets_rcvd_get_elem,
.xpath = "/frr-ripd:ripd/instance/state/neighbors/neighbor/bad-packets-rcvd",
.cbs.get_elem = ripd_instance_state_neighbors_neighbor_bad_packets_rcvd_get_elem,
},
{
.xpath = "/frr-ripd:ripd/state/neighbors/neighbor/bad-routes-rcvd",
.cbs.get_elem = ripd_state_neighbors_neighbor_bad_routes_rcvd_get_elem,
.xpath = "/frr-ripd:ripd/instance/state/neighbors/neighbor/bad-routes-rcvd",
.cbs.get_elem = ripd_instance_state_neighbors_neighbor_bad_routes_rcvd_get_elem,
},
{
.xpath = "/frr-ripd:ripd/state/routes/route",
.cbs.get_next = ripd_state_routes_route_get_next,
.cbs.get_keys = ripd_state_routes_route_get_keys,
.cbs.lookup_entry = ripd_state_routes_route_lookup_entry,
.xpath = "/frr-ripd:ripd/instance/state/routes/route",
.cbs.get_next = ripd_instance_state_routes_route_get_next,
.cbs.get_keys = ripd_instance_state_routes_route_get_keys,
.cbs.lookup_entry = ripd_instance_state_routes_route_lookup_entry,
},
{
.xpath = "/frr-ripd:ripd/state/routes/route/prefix",
.cbs.get_elem = ripd_state_routes_route_prefix_get_elem,
.xpath = "/frr-ripd:ripd/instance/state/routes/route/prefix",
.cbs.get_elem = ripd_instance_state_routes_route_prefix_get_elem,
},
{
.xpath = "/frr-ripd:ripd/state/routes/route/next-hop",
.cbs.get_elem = ripd_state_routes_route_next_hop_get_elem,
.xpath = "/frr-ripd:ripd/instance/state/routes/route/next-hop",
.cbs.get_elem = ripd_instance_state_routes_route_next_hop_get_elem,
},
{
.xpath = "/frr-ripd:ripd/state/routes/route/interface",
.cbs.get_elem = ripd_state_routes_route_interface_get_elem,
.xpath = "/frr-ripd:ripd/instance/state/routes/route/interface",
.cbs.get_elem = ripd_instance_state_routes_route_interface_get_elem,
},
{
.xpath = "/frr-ripd:ripd/state/routes/route/metric",
.cbs.get_elem = ripd_state_routes_route_metric_get_elem,
.xpath = "/frr-ripd:ripd/instance/state/routes/route/metric",
.cbs.get_elem = ripd_instance_state_routes_route_metric_get_elem,
},
{
.xpath = "/frr-ripd:clear-rip-route",

1
ripd/ripd.h
View File

@ -517,6 +517,7 @@ extern void ripd_notif_send_auth_type_failure(const char *ifname);
extern void ripd_notif_send_auth_failure(const char *ifname);
extern struct zebra_privs_t ripd_privs;
extern struct rip_instance_head rip_instances;
/* Master thread strucutre. */
extern struct thread_master *master;

136
yang/frr-ripd.yang
View File

@ -298,83 +298,83 @@ module frr-ripd {
'(./receive = "2" and ./send = "2") or ' +
'(./receive = "1-2" and ./send = "2")';
}
}
/*
* Operational data.
*/
container state {
config false;
description
"Operational data.";
container neighbors {
/*
* Operational data.
*/
container state {
config false;
description
"Neighbor information.";
list neighbor {
key "address";
"Operational data.";
container neighbors {
description
"A RIP neighbor.";
leaf address {
type inet:ipv4-address;
"Neighbor information.";
list neighbor {
key "address";
description
"IP address that a RIP neighbor is using as its
source address.";
}
leaf last-update {
type yang:date-and-time;
description
"The time when the most recent RIP update was
received from this neighbor.";
}
leaf bad-packets-rcvd {
type yang:counter32;
description
"The number of RIP invalid packets received from
this neighbor which were subsequently discarded
for any reason (e.g. a version 0 packet, or an
unknown command type).";
}
leaf bad-routes-rcvd {
type yang:counter32;
description
"The number of routes received from this neighbor,
in valid RIP packets, which were ignored for any
reason (e.g. unknown address family, or invalid
metric).";
"A RIP neighbor.";
leaf address {
type inet:ipv4-address;
description
"IP address that a RIP neighbor is using as its
source address.";
}
leaf last-update {
type yang:date-and-time;
description
"The time when the most recent RIP update was
received from this neighbor.";
}
leaf bad-packets-rcvd {
type yang:counter32;
description
"The number of RIP invalid packets received from
this neighbor which were subsequently discarded
for any reason (e.g. a version 0 packet, or an
unknown command type).";
}
leaf bad-routes-rcvd {
type yang:counter32;
description
"The number of routes received from this neighbor,
in valid RIP packets, which were ignored for any
reason (e.g. unknown address family, or invalid
metric).";
}
}
}
}
container routes {
description
"Route information.";
list route {
key "prefix";
container routes {
description
"A RIP IPv4 route.";
leaf prefix {
type inet:ipv4-prefix;
"Route information.";
list route {
key "prefix";
description
"IP address (in the form A.B.C.D) and prefix length,
separated by the slash (/) character. The range of
values for the prefix-length is 0 to 32.";
}
leaf next-hop {
type inet:ipv4-address;
description
"Next hop IPv4 address.";
}
leaf interface {
type string;
description
"The interface that the route uses.";
}
leaf metric {
type uint8 {
range "0..16";
"A RIP IPv4 route.";
leaf prefix {
type inet:ipv4-prefix;
description
"IP address (in the form A.B.C.D) and prefix length,
separated by the slash (/) character. The range of
values for the prefix-length is 0 to 32.";
}
leaf next-hop {
type inet:ipv4-address;
description
"Next hop IPv4 address.";
}
leaf interface {
type string;
description
"The interface that the route uses.";
}
leaf metric {
type uint8 {
range "0..16";
}
description
"Route metric.";
}
description
"Route metric.";
}
}
}