diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py index 1aad4fef4..aea3deecd 100644 --- a/src/registrar/models/domain.py +++ b/src/registrar/models/domain.py @@ -523,32 +523,9 @@ class Domain(TimeStampedModel, DomainHelper): else: addDnssecdata["dsData"] = None - elif _dnssecdata and _dnssecdata.keyData is not None: - # initialize addDnssecdata and remDnssecdata for keyData - addDnssecdata["keyData"] = _dnssecdata.keyData - - if oldDnssecdata and len(oldDnssecdata.keyData) > 0: - # if existing keyData not in new keyData, mark for removal - keyDataForRemoval = [ - keyData - for keyData in oldDnssecdata.keyData - if keyData not in _dnssecdata.keyData - ] - if len(keyDataForRemoval) > 0: - remDnssecdata["keyData"] = keyDataForRemoval - - # if new keyData not in existing keyData, mark for add - keyDataForAdd = [ - keyData - for keyData in _dnssecdata.keyData - if keyData not in oldDnssecdata.keyData - ] - if len(keyDataForAdd) > 0: - addDnssecdata["keyData"] = keyDataForAdd else: - # there are no new dsData or keyData, remove all + # there are no new dsData, remove all dsData from existing remDnssecdata["dsData"] = getattr(oldDnssecdata, "dsData", None) - remDnssecdata["keyData"] = getattr(oldDnssecdata, "keyData", None) return addDnssecdata, remDnssecdata @@ -558,12 +535,10 @@ class Domain(TimeStampedModel, DomainHelper): addParams = { "maxSigLife": _addDnssecdata.get("maxSigLife", None), "dsData": _addDnssecdata.get("dsData", None), - "keyData": _addDnssecdata.get("keyData", None), } remParams = { "maxSigLife": _remDnssecdata.get("maxSigLife", None), "remDsData": _remDnssecdata.get("dsData", None), - "remKeyData": _remDnssecdata.get("keyData", None), } addRequest = commands.UpdateDomain(name=self.name) addExtension = commands.UpdateDomainDNSSECExtension(**addParams) @@ -575,15 +550,11 @@ class Domain(TimeStampedModel, DomainHelper): if ( "dsData" in _addDnssecdata and _addDnssecdata["dsData"] is not None - or "keyData" in _addDnssecdata - and _addDnssecdata["keyData"] is not None ): registry.send(addRequest, cleaned=True) if ( "dsData" in _remDnssecdata and _remDnssecdata["dsData"] is not None - or "keyData" in _remDnssecdata - and _remDnssecdata["keyData"] is not None ): registry.send(remRequest, cleaned=True) except RegistryError as e: