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

confd: LLDP upgrade to support per-port admin-status

Browse Source 
This update enhances the LLDP configuration by enabling per-port
administration through the `admin-status` parameter. Users can now
individually enable or disable LLDP operation on specific ports.

Fixes #578
This commit is contained in:
Ahmed Karic
2025-01-23 13:16:40 +01:00
parent 28c0cee4e3
commit ee441e172d
2 changed files with 69 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/confd/src/infix-services.c
+17 -4
View File
@@ -310,6 +310,7 @@ static int lldp_change(sr_session_ctx_t *session, uint32_t sub_id, const char *m
{
struct lyd_node *node = NULL;
sr_data_t *cfg;
struct lyd_node *subnode;
switch (event) {
case SR_EV_ENABLED:
@@ -322,10 +323,22 @@ static int lldp_change(sr_session_ctx_t *session, uint32_t sub_id, const char *m
const char *tx_interval = lydx_get_cattr(node, "message-tx-interval");
FILE *fp = fopen(LLDP_CONFIG_NEXT, "w");
if (!fp) {
ERROR("Failed to open %s for writing", LLDP_CONFIG_NEXT);
ERRNO("Failed to open %s for writing", LLDP_CONFIG_NEXT);
break;
}
fprintf(fp, "configure lldp tx-interval %s\n", tx_interval);
LY_LIST_FOR(lyd_child(node), subnode) {
if (!strcmp(subnode->schema->name, "port")) {
const char *port_name = lydx_get_cattr(subnode, "name");
const char *admin_status = lydx_get_cattr(subnode, "admin-status");
if (strcmp(admin_status, "tx-and-rx") == 0)
admin_status = "rx-and-tx";
fprintf(fp, "configure ports %s lldp status %s\n", port_name, admin_status);
}
}
fclose(fp);
}
@@ -334,13 +347,13 @@ static int lldp_change(sr_session_ctx_t *session, uint32_t sub_id, const char *m
case SR_EV_DONE:
if (fexist(LLDP_CONFIG_NEXT)){
if (erase(LLDP_CONFIG))
ERROR("Failed to remove old %s", LLDP_CONFIG);
ERRNO("Failed to remove old %s", LLDP_CONFIG);
rename(LLDP_CONFIG_NEXT, LLDP_CONFIG);
}
else
if (erase(LLDP_CONFIG))
ERROR("Failed to remove old %s", LLDP_CONFIG);
ERRNO("Failed to remove old %s", LLDP_CONFIG);
svc_change(session, event, xpath, "lldp", "lldpd");
break;
@@ -516,7 +529,7 @@ static int change_keystore_cb(sr_session_ctx_t *session, uint32_t sub_id, const
case SR_EV_DONE:
if(fexist(SSH_HOSTKEYS_NEXT)) {
if(rmrf(SSH_HOSTKEYS)) {
ERROR("Failed to remove old SSH hostkeys: %d", errno);
ERRNO("Failed to remove old SSH hostkeys: %d", errno);
}
rename(SSH_HOSTKEYS_NEXT, SSH_HOSTKEYS);
svc_change(session, event, "/infix-services:ssh", "ssh", "sshd");
src/confd/yang/infix-lldp.yang
+52 -3
View File
@@ -41,9 +41,6 @@ module infix-lldp {
deviation "/lldp:lldp/lldp:notification-interval" {
deviate not-supported;
}
deviation "/lldp:lldp/lldp:port" {
deviate not-supported;
}
deviation "/lldp:lldp/lldp:reinit-delay" {
deviate not-supported;
}
@@ -53,4 +50,56 @@ module infix-lldp {
deviation "/lldp:lldp/lldp:tx-fast-init" {
deviate not-supported;
}
deviation "/lldp:lldp/lldp:port/lldp:notification-enable" {
deviate not-supported;
}
deviation "/lldp:lldp/lldp:port/lldp:tlvs-tx-enable" {
deviate not-supported;
}
deviation "/lldp:lldp/lldp:port/lldp:management-address-tx-port" {
deviate not-supported;
}
deviation "/lldp:lldp/lldp:port/lldp:port-id-subtype" {
deviate not-supported;
}
deviation "/lldp:lldp/lldp:port/lldp:port-id" {
deviate not-supported;
}
deviation "/lldp:lldp/lldp:port/lldp:port-desc" {
deviate not-supported;
}
deviation "/lldp:lldp/lldp:port/lldp:tx-statistics" {
deviate not-supported;
}
deviation "/lldp:lldp/lldp:port/lldp:rx-statistics" {
deviate not-supported;
}
deviation "/lldp:lldp/lldp:port/lldp:remote-systems-data" {
deviate not-supported;
}
deviation "/lldp:lldp/lldp:port/lldp:message-fast-tx" {
deviate not-supported;
}
deviation "/lldp:lldp/lldp:port/lldp:message-tx-hold-multiplier" {
deviate not-supported;
}
deviation "/lldp:lldp/lldp:port/lldp:message-tx-interval" {
deviate not-supported;
}
deviation "/lldp:lldp/lldp:port/lldp:notification-interval" {
deviate not-supported;
}
deviation "/lldp:lldp/lldp:port/lldp:reinit-delay" {
deviate not-supported;
}
deviation "/lldp:lldp/lldp:port/lldp:tx-credit-max" {
deviate not-supported;
}
deviation "/lldp:lldp/lldp:port/lldp:tx-fast-init" {
deviate not-supported;
}
}