Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add more northbound operation types #14542

Merged
merged 6 commits into from
Jan 12, 2024
Merged

Add more northbound operation types #14542

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5d1a314
lib: split nb_operation into two types
idryzhov Oct 5, 2023
76e4eb8
mgmtd, lib: implement CREATE_EXCL operation
idryzhov Oct 5, 2023
3c2598a
mgmt, lib: differentiate DELETE and REMOVE operations
idryzhov Oct 6, 2023
fe0d4dc
lib: move dnode creation into a separate function
idryzhov Oct 9, 2023
d726114
mgmt, lib: implement REPLACE operation
idryzhov Oct 9, 2023
7e48299
lib: explain semantics of northbound operations
idryzhov Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
lib: move dnode creation into a separate function 
Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
  • Loading branch information
@idryzhov
idryzhov committed Jan 11, 2024
commit fe0d4dc2cb8fdf63524d92ab364157904327eb29
61 changes: 33 additions & 28 deletions lib/northbound.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,6 +659,32 @@ void nb_config_diff(const struct nb_config *config1,
lyd_free_all(diff);
}

static int dnode_create(struct nb_config *candidate, const char *xpath,
const char *value, uint32_t options,
struct lyd_node **new_dnode)
{
struct lyd_node *dnode;
LY_ERR err;

err = lyd_new_path(candidate->dnode, ly_native_ctx, xpath, value,
options, &dnode);
if (err) {
flog_warn(EC_LIB_LIBYANG, "%s: lyd_new_path(%s) failed: %d",
__func__, xpath, err);
return NB_ERR;
} else if (dnode) {
err = lyd_new_implicit_tree(dnode, LYD_IMPLICIT_NO_STATE, NULL);
if (err) {
flog_warn(EC_LIB_LIBYANG,
"%s: lyd_new_implicit_all failed: %d",
__func__, err);
}
}
if (new_dnode)
*new_dnode = dnode;
return NB_OK;
}

int nb_candidate_edit(struct nb_config *candidate,
const struct nb_node *nb_node,
enum nb_operation operation, const char *xpath,
Expand All @@ -684,22 +710,11 @@ int nb_candidate_edit(struct nb_config *candidate,
options = LYD_NEW_PATH_UPDATE;
fallthrough;
case NB_OP_CREATE_EXCL:
err = lyd_new_path(candidate->dnode, ly_native_ctx, xpath_edit,
(void *)data->value, options, &dnode);
err = dnode_create(candidate, xpath_edit, data->value, options,
&dnode);
if (err) {
flog_warn(EC_LIB_LIBYANG,
"%s: lyd_new_path(%s) failed: %d", __func__,
xpath_edit, err);
return NB_ERR;
return err;
} else if (dnode) {
/* Create default nodes */
LY_ERR err = lyd_new_implicit_tree(
dnode, LYD_IMPLICIT_NO_STATE, NULL);
if (err) {
flog_warn(EC_LIB_LIBYANG,
"%s: lyd_new_implicit_all failed: %d",
__func__, err);
}
/*
* create dependency
*
Expand All @@ -711,21 +726,11 @@ int nb_candidate_edit(struct nb_config *candidate,
nb_node->dep_cbs.get_dependency_xpath(
dnode, dep_xpath);

err = lyd_new_path(candidate->dnode,
ly_native_ctx, dep_xpath,
NULL, LYD_NEW_PATH_UPDATE,
&dep_dnode);
/* Create default nodes */
if (!err && dep_dnode)
err = lyd_new_implicit_tree(
dep_dnode,
LYD_IMPLICIT_NO_STATE, NULL);
err = dnode_create(candidate, dep_xpath, NULL,
LYD_NEW_PATH_UPDATE, NULL);
if (err) {
flog_warn(
EC_LIB_LIBYANG,
"%s: dependency: lyd_new_path(%s) failed: %d",
__func__, dep_xpath, err);
return NB_ERR;
lyd_free_tree(dnode);
return err;
}
}
}
Expand Down