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

Migrates local network user scripts to the new host pools configuration

Browse source
This commit is contained in:
Simone Mainardi 2020-07-10 18:45:19 +02:00
parent ecdf9e22cd
commit bd4921df55
3 changed files with 30 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
scripts/lua/modules/pools/base_pools.lua
View file

@ -227,7 +227,7 @@ function base_pools:edit_pool(pool_id, new_name, new_members, new_configset_id)
local assigned_members = self:get_assigned_members()
for _, member in pairs(new_members) do
if assigned_members[member] and assigned_members[member] ~= pool_id then
if assigned_members[member] and assigned_members[member]["pool_id"] ~= pool_id then
-- Member already existing in another pool
checks_ok = false
break
@ -390,7 +390,7 @@ function base_pools:get_assigned_members()
if pool_details and pool_details["members"] then
for _, member in pairs(pool_details["members"]) do
res[member] = tonumber(pool_id)
res[member] = {pool_id = tonumber(pool_id), configset_id = pool_details["configset_id"]}
end
end
end
@ -519,4 +519,18 @@ end
-- ##############################################
-- @brief Cached `assigned_pool_members` are read and the configset_id associated to `member` is returned
-- @param assigned_pool_members A table obtained calling self:get_assigned_members()
-- @param member a valid pool member
-- @return The configset_id found for `member` or the default configset_id
function base_pools:get_configset_id(assigned_pool_members, member)
if assigned_pool_members[member] and assigned_pool_members[member]["configset_id"] then
return assigned_pool_members[member]["configset_id"]
end
return user_scripts.DEFAULT_CONFIGSET_ID
end
-- ##############################################
return base_pools