From e1a432d3dc0b9b8878ad142a1df2bf6b84080d67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rajmund=20Hru=C5=A1ka?= <rajmund.hruska@cesnet.cz>
Date: Thu, 24 Mar 2022 18:21:33 +0100
Subject: [PATCH] Fix: Try pairing groups by name when updating existing
groups. (Redmine issue: #6227)
---
lib/mentat/module/netmngr.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/lib/mentat/module/netmngr.py b/lib/mentat/module/netmngr.py
index fc169b111..9287a9ad7 100644
--- a/lib/mentat/module/netmngr.py
+++ b/lib/mentat/module/netmngr.py
@@ -572,10 +572,13 @@ class MentatNetmngrScript(mentat.script.fetcher.FetcherScript):
:param bool status_only: Do not actually perform any database operations, just report status.
"""
for group_name in sorted(abuse_group_dict.keys()):
- if group_name in wi_file_data:
+ name = None
+ if group_name in wi_file_data: name = group_name
+ if abuse_group_dict[group_name].name in wi_file_data: name = abuse_group_dict[group_name].name
+ if name:
self._group_update_networks(
abuse_group_dict[group_name],
- [network for networks in wi_file_data[group_name].values() for network in networks],
+ [network for networks in wi_file_data[name].values() for network in networks],
result,
status_only)
self.sqlservice.session.commit()
--
GitLab