Skip to content

Develop #505

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

Merged
boubeejul merged 2 commits into from
Jun 1, 2026
Merged

Develop #505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5de88b
removes CIDR exception raise and validate_v3 from networks patch
boubeejul Jun 1, 2026
5af2982
Merge pull request #504 from globocom/FLSTD-3267
boubeejul Jun 1, 2026
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: 0 additions & 3 deletions networkapi/ambiente/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2130,9 +2130,6 @@ def get(self, cidr_id=None, env_id=None):
objects = EnvCIDR.objects.filter(id_env=env_id)
if not objects:
log.debug('There is no CIDR linked with the environment id=%s.' % env_id)
raise ObjectDoesNotExist
except ObjectDoesNotExist:
raise CIDRErrorV3('There is no CIDR linked with the environment id=%s.' % env_id)
except OperationalError as e:
self.log.error('Lock wait timeout exceeded.')
raise OperationalError(e, 'Lock wait timeout exceeded; try restarting transaction')
Expand Down
4 changes: 2 additions & 2 deletions networkapi/ip/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,7 +939,7 @@ def patch_v3(self, networkv4, locks_used=[], force=False):
locks_list = create_lock_with_blocking(locks_name)

try:
self.validate_v3()
#self.validate_v3()
self.save()

except NetworkIPv4ErrorV3, e:
Expand Down Expand Up @@ -3319,7 +3319,7 @@ def patch_v3(self, networkv6, locks_used=[], force=False):
locks_list = create_lock_with_blocking(locks_name)

try:
self.validate_v3()
#self.validate_v3()
self.save()

except NetworkIPv6ErrorV3, e:
Expand Down
Loading