diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py index d14ed41ba..b93950df0 100644 --- a/src/registrar/forms/domain.py +++ b/src/registrar/forms/domain.py @@ -26,7 +26,14 @@ class DomainNameserverForm(forms.Form): server = forms.CharField(label="Name server", strip=True) - ip = forms.CharField(label="IP address", strip=True, required=False) + ip = forms.CharField( + label="IP address", + strip=True, + required=False, + validators=[ + # TODO in progress + ], + ) NameserverFormset = formset_factory( diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py index 80bb1ab30..0b9139277 100644 --- a/src/registrar/models/domain.py +++ b/src/registrar/models/domain.py @@ -313,14 +313,14 @@ class Domain(TimeStampedModel, DomainHelper): NameserverError (if exception hit) Returns: None""" - if self.isSubdomain(nameserver) and (ip is None or ip == []): + if self.isSubdomain(nameserver) and (ip is None or ip == [] or ip != []): raise NameserverError(code=nsErrorCodes.MISSING_IP, nameserver=nameserver) - elif not self.isSubdomain(nameserver) and (ip is not None and ip != []): + elif not self.isSubdomain(nameserver) and (ip is not None and ip != [] and ip != ['']): raise NameserverError( code=nsErrorCodes.GLUE_RECORD_NOT_ALLOWED, nameserver=nameserver, ip=ip ) - elif ip is not None and ip != []: + elif ip is not None and ip != [] and ip != ['']: for addr in ip: logger.info(f"ip address {addr}") if not self._valid_ip_addr(addr): diff --git a/src/registrar/templates/domain_nameservers.html b/src/registrar/templates/domain_nameservers.html index 37fa1eb85..fffd4b8c0 100644 --- a/src/registrar/templates/domain_nameservers.html +++ b/src/registrar/templates/domain_nameservers.html @@ -16,7 +16,7 @@ {% include "includes/required_fields.html" %} -