mirror/bbfdm
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/bbfdm.git synced 2025-12-10 07:44:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make refresh references API visible from micro-services

Browse source
This commit is contained in:
Amin Ben Romdhane 2025-04-11 13:17:51 +02:00
parent 45a6d7e0c7
commit 4d520ceb62
2 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
libbbfdm-ubus/bbfdm-ubus.c
View file

@ -72,26 +72,6 @@ static void fill_optional_data(bbfdm_data_t *data, struct blob_attr *msg)
} }
} }
static int refresh_references_db(unsigned int dm_type)
{
struct dmctx bbf_ctx = {
.in_param = ROOT_NODE,
.dm_type = dm_type
};
bbf_init(&bbf_ctx);
int res = bbfdm_cmd_exec(&bbf_ctx, BBF_REFERENCES_DB);
if (!res) {
// Apply all bbfdm changes
dmuci_commit_bbfdm();
}
bbf_cleanup(&bbf_ctx);
return res;
}
static void async_req_free(struct bbfdm_async_req *r) static void async_req_free(struct bbfdm_async_req *r)
{ {
free(r); free(r);
@ -397,7 +377,7 @@ int bbfdm_set_handler(struct ubus_context *ctx, struct ubus_object *obj,
bbf_cleanup(&data.bbf_ctx); bbf_cleanup(&data.bbf_ctx);
if (!fault) { if (!fault) {
refresh_references_db(data.bbf_ctx.dm_type); bbfdm_refresh_references(data.bbf_ctx.dm_type);
} }
end: end:
@ -532,7 +512,7 @@ end:
bbf_cleanup(&data.bbf_ctx); bbf_cleanup(&data.bbf_ctx);
if (!fault) { if (!fault) {
refresh_references_db(data.bbf_ctx.dm_type); bbfdm_refresh_references(data.bbf_ctx.dm_type);
} }
ubus_send_reply(ctx, req, data.bb.head); ubus_send_reply(ctx, req, data.bb.head);
@ -621,7 +601,7 @@ int bbfdm_refresh_references_db(struct ubus_context *ctx, struct ubus_object *ob
memset(&bb, 0, sizeof(struct blob_buf)); memset(&bb, 0, sizeof(struct blob_buf));
blob_buf_init(&bb, 0); blob_buf_init(&bb, 0);
int res = refresh_references_db(BBFDM_BOTH); int res = bbfdm_refresh_references(BBFDM_BOTH);
blobmsg_add_u8(&bb, "status", !res ? true : false); blobmsg_add_u8(&bb, "status", !res ? true : false);
@ -762,7 +742,7 @@ int bbfdm_ubus_regiter_init(struct bbfdm_context *bbfdm_ctx)
if (err != UBUS_STATUS_OK) if (err != UBUS_STATUS_OK)
return -1; return -1;
err = refresh_references_db(BBFDM_BOTH); err = bbfdm_refresh_references(BBFDM_BOTH);
if (err) { if (err) {
BBF_ERR("Failed to refresh instance data base"); BBF_ERR("Failed to refresh instance data base");
return -1; return -1;
@ -796,3 +776,23 @@ void bbfdm_ubus_load_data_model(DM_MAP_OBJ *DynamicObj)
{ {
INTERNAL_ROOT_TREE = DynamicObj; INTERNAL_ROOT_TREE = DynamicObj;
} }
int bbfdm_refresh_references(unsigned int dm_type)
{
struct dmctx bbf_ctx = {
.in_param = ROOT_NODE,
.dm_type = dm_type
};
bbf_init(&bbf_ctx);
int res = bbfdm_cmd_exec(&bbf_ctx, BBF_REFERENCES_DB);
if (!res) {
// Apply all bbfdm changes
dmuci_commit_bbfdm();
}
bbf_cleanup(&bbf_ctx);
return res;
}

1
libbbfdm-ubus/bbfdm-ubus.h
View file

@ -50,5 +50,6 @@ int bbfdm_ubus_regiter_free(struct bbfdm_context *bbfdm_ctx);
void bbfdm_ubus_set_service_name(struct bbfdm_context *bbfdm_ctx, const char *srv_name); void bbfdm_ubus_set_service_name(struct bbfdm_context *bbfdm_ctx, const char *srv_name);
void bbfdm_ubus_set_log_level(int log_level); void bbfdm_ubus_set_log_level(int log_level);
void bbfdm_ubus_load_data_model(DM_MAP_OBJ *DynamicObj); void bbfdm_ubus_load_data_model(DM_MAP_OBJ *DynamicObj);
int bbfdm_refresh_references(unsigned int dm_type);
#endif /* BBFDM_UBUS_H */ #endif /* BBFDM_UBUS_H */