Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ospf area bugfix #466

Merged
merged 3 commits into from
Oct 10, 2024
+7 −4
Merged

Ospf area bugfix #466

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c892e2
Fix OSPF area bug
stalabi1 Oct 10, 2024
352decc
Add fragment
stalabi1 Oct 10, 2024
5a3c57f
Address review comment
stalabi1 Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelogs/fragments/466-ospf-area-bugfix.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
bugfixes:
- sonic_ospf_area - Fix OSPF area bug (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/466).
9 changes: 5 additions & 4 deletions plugins/module_utils/network/sonic/config/ospf_area/ospf_area.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -974,10 +974,11 @@ def build_area_stub_delete_requests(self, request_root, commands, have):
# actually clearing stuff means deleting area
# area having nothing related to stub also ends up in this case. requests will be empty.
return True, requests, len(requests) > 0
elif len(requests) > 0:
# clearing some of the settings in stub but not all
# commands has to be a subset of have and whatever in it is translated into requests
return False, requests, False

Copy link
Collaborator

@kerry-meyer kerry-meyer Oct 10, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, none of the "settings" were getting cleared for the problem case, so this comment isn't completely accurate.

Also, the wording of the existing comment was confusing.

Suggested re-wording for this comment:

Not all stub configuration is being deleted. (It is also possible that none of the stub options requested for deletion match any current configuration. In that case, no stub configuration is being deleted.)

# clearing some of the settings in stub but not all
# commands has to be a subset of have and whatever in it is translated into requests or
# there are no requests
return False, requests, False

def build_area_delete_networks_requests(self, request_root, commands, have):
if commands is None:
Expand Down
Loading