From e19674ea703884735343396aae126eaa8bf2bca0 Mon Sep 17 00:00:00 2001 From: Amin Ben Ramdhane Date: Sun, 6 Dec 2020 22:49:29 +0100 Subject: [PATCH] Align BulkData & XMPP & TWAMP with latest bbf changes --- bulkdata/src/datamodel.c | 12 ++++++------ twamp/src/datamodel.c | 4 ++-- xmpp/src/datamodel.c | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bulkdata/src/datamodel.c b/bulkdata/src/datamodel.c index d033471a0..9ce63d307 100644 --- a/bulkdata/src/datamodel.c +++ b/bulkdata/src/datamodel.c @@ -36,8 +36,8 @@ static int browseBulkDataProfileInst(struct dmctx *dmctx, DMNODE *parent_node, v synchronize_specific_config_sections_with_dmmap("bulkdata", "profile", "dmmap_bulkdata", &dup_list); list_for_each_entry(p, &dup_list, list) { - inst = handle_update_instance(1, dmctx, &max_inst, update_instance_alias, 5, - p->dmmap_section, "profile_instance", "profile_alias", "dmmap_bulkdata", "profile"); + inst = handle_update_instance(1, dmctx, &max_inst, update_instance_alias, 3, + p->dmmap_section, "profile_instance", "profile_alias"); if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)p->config_section, inst) == DM_STOP) break; @@ -65,8 +65,8 @@ static int browseBulkDataProfileParameterInst(struct dmctx *dmctx, DMNODE *paren browse_args.option = "profile_id"; browse_args.value = prev_profile_id; - inst = handle_update_instance(2, dmctx, &max_inst, update_instance_alias, 7, - p->dmmap_section, "parameter_instance", "parameter_alias", "dmmap_bulkdata", "profile_parameter", + inst = handle_update_instance(2, dmctx, &max_inst, update_instance_alias, 5, + p->dmmap_section, "parameter_instance", "parameter_alias", check_browse_section, (void *)&browse_args); if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)p->config_section, inst) == DM_STOP) @@ -95,8 +95,8 @@ static int browseBulkDataProfileHTTPRequestURIParameterInst(struct dmctx *dmctx, browse_args.option = "profile_id"; browse_args.value = prev_profile_id; - inst = handle_update_instance(2, dmctx, &max_inst, update_instance_alias, 7, - p->dmmap_section, "requesturiparameter_instance", "requesturiparameter_alias", "dmmap_bulkdata", "profile_http_request_uri_parameter", + inst = handle_update_instance(2, dmctx, &max_inst, update_instance_alias, 5, + p->dmmap_section, "requesturiparameter_instance", "requesturiparameter_alias", check_browse_section, (void *)&browse_args); if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)p->config_section, inst) == DM_STOP) diff --git a/twamp/src/datamodel.c b/twamp/src/datamodel.c index 73724ebab..d800a4909 100644 --- a/twamp/src/datamodel.c +++ b/twamp/src/datamodel.c @@ -279,8 +279,8 @@ static int browseIPInterfaceTWAMPReflectorInst(struct dmctx *dmctx, DMNODE *pare uci_foreach_option_eq("twamp", "twamp_reflector", "interface", section_name(((struct ip_args *)prev_data)->ip_sec), s) { - inst = handle_update_instance(2, dmctx, &max_inst, update_instance_alias, 5, - s, "twamp_inst", "twamp_alias", "twamp", "twamp_reflector"); + inst = handle_update_instance(2, dmctx, &max_inst, update_instance_alias, 3, + s, "twamp_inst", "twamp_alias"); if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)s, inst) == DM_STOP) break; diff --git a/xmpp/src/datamodel.c b/xmpp/src/datamodel.c index a3e0eb50c..b2424b26f 100644 --- a/xmpp/src/datamodel.c +++ b/xmpp/src/datamodel.c @@ -554,8 +554,8 @@ static int browsexmpp_connectionInst(struct dmctx *dmctx, DMNODE *parent_node, v synchronize_specific_config_sections_with_dmmap("xmpp", "connection", "dmmap_xmpp", &dup_list); list_for_each_entry(p, &dup_list, list) { - inst = handle_update_instance(1, dmctx, &max_inst, update_instance_alias, 5, - p->dmmap_section, "con_inst", "con_alias", "dmmap_xmpp", "connection"); + inst = handle_update_instance(1, dmctx, &max_inst, update_instance_alias, 3, + p->dmmap_section, "con_inst", "con_alias"); if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)p->config_section, inst) == DM_STOP) break; @@ -577,8 +577,8 @@ static int browsexmpp_connection_serverInst(struct dmctx *dmctx, DMNODE *parent_ list_for_each_entry(p, &dup_list, list) { - inst = handle_update_instance(2, dmctx, &max_inst, update_instance_alias, 5, - p->dmmap_section, "con_srv_inst", "con_srv_alias", "xmpp", "connection_server"); + inst = handle_update_instance(2, dmctx, &max_inst, update_instance_alias, 3, + p->dmmap_section, "con_srv_inst", "con_srv_alias"); if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)p->config_section, inst) == DM_STOP) break;