peter/infix
1
0
Fork 0
mirror of https://github.com/kernelkit/infix.git synced 2026-08-06 07:33:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

confd: add deviation for if:type limiting it to supported types

Browse Source 
This patch adds a new infix-interface-type, derived from the IANA base
type, allowing us to limit the list of supported native interface types.

Basing on IANA interface type ensure compatibility with other models,
e.g., standard/ieee/published/802.3/ieee802-ethernet-interface.yang,
which attaches itself to all interfaces of type ianaift:ethernetCsmacd.

Tested with yanglint and in Infix using ieee802-ethernet-interface.yang,
the 'ethernet' container was properly attached to interfaces of type
infixift:ethernet.

Tab completion in the CLI now lists only the supported types.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2023-08-22 13:32:47 +02:00
committed by Tobias Waldekranz
parent 43dd052707
commit 34fd50d1b8
7 changed files with 113 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/statd/statd.c
+9 -9
View File
@@ -267,24 +267,24 @@ static const char *get_yang_link_type(char *xpath, json_t *iface)
j_val = json_object_get(iface, "linkinfo");
if (!j_val)
return "iana-if-type:ethernetCsmacd";
return "infix-if-type:ethernet";
j_val = json_object_get(j_val, "info_kind");
if (!j_val)
return "iana-if-type:ethernetCsmacd";
return "infix-if-type:ethernet";
if (!json_is_string(j_val)) {
ERROR("Expected a JSON string for 'info_kind'");
return "iana-if-type:other";
return "infix-if-type:other";
}
kind = json_string_value(j_val);
if (strcmp(kind, "veth") == 0)
return "infix-if-type:veth";
if (strcmp(kind, "vlan") == 0)
return "iana-if-type:l2vlan";
return "infix-if-type:vlan";
if (strcmp(kind, "bridge") == 0)
return "iana-if-type:bridge";
return "infix-if-type:bridge";
/**
* We could return ethernetCsmacd here, but it might hide some
@@ -292,15 +292,15 @@ static const char *get_yang_link_type(char *xpath, json_t *iface)
*/
ERROR("Unable to determine info_kind for \"%s\"", xpath);
return "iana-if-type:other";
return "infix-if-type:other";
}
if (strcmp(type, "loopback") == 0)
return "iana-if-type:softwareLoopback";
return "infix-if-type:loopback";
ERROR("Unable to determine iana-if-type for \"%s\"", xpath);
ERROR("Unable to determine infix-if-type for \"%s\"", xpath);
return "iana-if-type:other";
return "infix-if-type:other";
}
static int ly_add_ip_link_data(const struct ly_ctx *ctx, struct lyd_node **parent,