zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-26 20:48:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

Address feedback from Neil

Browse source
This commit is contained in:
Rebecca Hsieh 2023-09-29 16:15:05 -07:00
parent f704fe7184
commit 71826a7a7a
No known key found for this signature in database
GPG key ID: 644527A2F375A379
3 changed files with 74 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/registrar/models/domain.py
View file

@ -294,11 +294,12 @@ class Domain(TimeStampedModel, DomainHelper):
return newDict
def isSubdomain(self, nameserver):
return nameserver.find(self.name) != -1
return self.name in nameserver
def checkHostIPCombo(self, nameserver: str, ip: list):
if self.isSubdomain(nameserver) and (ip is None or ip == []):
raise ValueError("Nameserver %s needs to have an ip address" % nameserver)
raise ValueError("Nameserver %s needs to have an "
"ip address because it is a subdomain" % nameserver)
elif not self.isSubdomain(nameserver) and (ip is not None and ip != []):
raise ValueError(
"Nameserver %s cannot be linked "
@ -306,15 +307,15 @@ class Domain(TimeStampedModel, DomainHelper):
)
return None
def getNameserverChanges(self, hosts: list[tuple[str]]):
def getNameserverChanges(self, hosts: list[tuple[str]]) -> tuple[list, list, dict, list]:
"""
calls self.nameserver, it should pull from cache but may result
in an epp call
returns tuple of four values as follows:
deleted_values:
updated_values:
deleted_values: list
updated_values: list
new_values: dict
oldNameservers:"""
oldNameservers: list"""
oldNameservers = self.nameservers
previousHostDict = self._convert_list_to_dict(oldNameservers)
@ -417,7 +418,7 @@ class Domain(TimeStampedModel, DomainHelper):
oldNameservers,
) = self.getNameserverChanges(hosts=hosts)
# TODO-848: Fix name here
# TODO-848: Fix name
successTotalNameservers = self._loop_through(
deleted_values, updated_values, new_values, oldNameservers
)
@ -1103,9 +1104,9 @@ class Domain(TimeStampedModel, DomainHelper):
and len(old_ip_list) != 0
):
return ErrorCode.COMMAND_COMPLETED_SUCCESSFULLY
added_ip_list = set(ip_list) - set(old_ip_list)
removed_ip_list = set(old_ip_list) - set(ip_list)
added_ip_list = set(ip_list).difference(old_ip_list)
removed_ip_list = set(old_ip_list).difference(ip_list)
request = commands.UpdateHost(
name=nameserver,