Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mentat-test
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
713
Mentat
mentat-test
Commits
e1a432d3
Commit
e1a432d3
authored
2 years ago
by
Rajmund Hruška
Browse files
Options
Downloads
Patches
Plain Diff
Fix: Try pairing groups by name when updating existing groups. (Redmine issue:
#6227
)
parent
99398720
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
lib/mentat/module/netmngr.py
+5
-2
5 additions, 2 deletions
lib/mentat/module/netmngr.py
with
5 additions
and
2 deletions
lib/mentat/module/netmngr.py
+
5
−
2
View file @
e1a432d3
...
@@ -572,10 +572,13 @@ class MentatNetmngrScript(mentat.script.fetcher.FetcherScript):
...
@@ -572,10 +572,13 @@ class MentatNetmngrScript(mentat.script.fetcher.FetcherScript):
:param bool status_only: Do not actually perform any database operations, just report status.
:param bool status_only: Do not actually perform any database operations, just report status.
"""
"""
for
group_name
in
sorted
(
abuse_group_dict
.
keys
()):
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
(
self
.
_group_update_networks
(
abuse_group_dict
[
group_name
],
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
,
result
,
status_only
)
status_only
)
self
.
sqlservice
.
session
.
commit
()
self
.
sqlservice
.
session
.
commit
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment