diff --git a/networkapi/ambiente/models.py b/networkapi/ambiente/models.py index 5d8c5aec..c072dc56 100644 --- a/networkapi/ambiente/models.py +++ b/networkapi/ambiente/models.py @@ -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') diff --git a/networkapi/ip/models.py b/networkapi/ip/models.py index 260f3f04..cc2b7c3b 100644 --- a/networkapi/ip/models.py +++ b/networkapi/ip/models.py @@ -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: @@ -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: