vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-01 16:30:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Rework user script working sets (a single configset is supported now)

Browse source
This commit is contained in:
Alfredo Cardigliano 2021-03-01 15:37:45 +01:00
parent 03512b963f
commit fa311e3ade
45 changed files with 259 additions and 1077 deletions
Download patch file Download diff file Expand all files Collapse all files

42
scripts/lua/modules/import_export/pool_import_export.lua
View file

@ -61,7 +61,6 @@ end
-- @return A table with a key "success" set to true is returned on success. A key "err" is set in case of failure, with one of the errors defined in rest_utils.consts.err.
function pool_import_export:import(conf)
local res = {}
local config_sets = user_scripts.getConfigsets()
-- local recipients = recipients_mod.get_all_recipients()
for pool_name, pool_list in pairs(conf) do
@ -69,37 +68,20 @@ function pool_import_export:import(conf)
local pool_instance = pool_instances[pool_name]
for _, pool_conf in ipairs(pool_list) do
-- Configset lookup to remap the ID
local config_set = user_scripts.findConfigSet(config_sets, pool_conf.configset_details.name)
local success = true
if config_set then
local configset_id = config_set.id
-- tprint("Configset "..pool_conf.configset_details.name.." with ID "..pool_conf.configset_id.." mapped to "..configset_id)
-- Recipient lookup to remap the ID
local recipients_ids = {}
for _, recipient_details in pairs(pool_conf.recipients) do
local recipient = recipients_mod.get_recipient_by_name(recipient_details.recipient_name)
recipients_ids[#recipients_ids+1] = recipient.recipient_id
--tprint("Recipient "..recipient_details.recipient_name.." with ID "..recipient_details.recipient_id.." mapped to "..recipient.recipient_id)
end
-- Add Pool
local new_pool_id = pool_instance:add_pool(
pool_conf.name,
pool_conf.members,
configset_id,
recipients_ids
)
else
success = false
-- Recipient lookup to remap the ID
local recipients_ids = {}
for _, recipient_details in pairs(pool_conf.recipients) do
local recipient = recipients_mod.get_recipient_by_name(recipient_details.recipient_name)
recipients_ids[#recipients_ids+1] = recipient.recipient_id
--tprint("Recipient "..recipient_details.recipient_name.." with ID "..recipient_details.recipient_id.." mapped to "..recipient.recipient_id)
end
if not success then
res.err = rest_utils.consts.err.partial_import
end
-- Add Pool
local new_pool_id = pool_instance:add_pool(
pool_conf.name,
pool_conf.members,
recipients_ids
)
end
end
end

9
scripts/lua/modules/import_export/scripts_import_export.lua
View file

@ -52,7 +52,7 @@ function scripts_import_export:import(conf)
for config_id, config_set in pairs(conf) do
if config_set.name ~= nil then
local success, err = user_scripts.createOrReplaceConfigset(config_set)
local success = user_scripts.createOrReplaceConfigset(config_set)
if not success then
res.err = rest_utils.consts.err.internal_error
end
@ -71,7 +71,10 @@ end
-- @brief Export configuration
-- @return The current configuration
function scripts_import_export:export()
local conf = user_scripts.getConfigsets()
local conf = {}
conf[user_scripts.DEFAULT_CONFIGSET_ID] = user_scripts.getConfigset()
return conf
end
@ -79,7 +82,7 @@ end
-- @brief Reset configuration
function scripts_import_export:reset()
user_scripts.resetConfigsets()
user_scripts.resetConfigset()
end
-- ##############################################