Merge pull request #1688 from grycap/dydns

Fix error

Author: micafer

IM/connectors/EGI.py

@@ -78,6 +78,7 @@ def add_dns_entry(self, hostname, domain, ip, auth_data, extra_args=None):
         """
         Add a DNS entry to the DNS server
         """
+        domain = domain[:-1] if domain.endswith(".") else domain
         im_auth = auth_data.getAuthInfo("InfrastructureManager")
         try:
             secret = None
@@ -116,7 +117,6 @@ def add_dns_entry(self, hostname, domain, ip, auth_data, extra_args=None):
                 parts = hostname[6:].split("@")
                 secret = parts[0]
                 hostname = parts[1]
-                domain = domain[:-1]
             else:
                 self.log_error(f"Error updating DNS entry {hostname}.{domain}: No secret nor token provided")
                 return False
@@ -144,6 +144,7 @@ def del_dns_entry(self, hostname, domain, ip, auth_data, extra_args=None):
         """
         Delete a DNS entry from the DNS server
         """
+        domain = domain[:-1] if domain.endswith(".") else domain
         im_auth = auth_data.getAuthInfo("InfrastructureManager")
         try:
             if im_auth and im_auth[0].get("token"):

test/unit/connectors/EGI.py

@@ -70,7 +70,7 @@ def test_del_dns(self, mock_get_domains, mock_get_host, mock_get):
         mock_get.return_value = MagicMock(status_code=200, json=lambda: {"status": "ok"})
         auth_data = Authentication([{'type': 'InfrastructureManager', 'token': 'access_token'}])
         cloud = EGICloudConnector(None, None)
-        success = EGICloudConnector.del_dns_entry(cloud, "hostname", "domain", "ip", auth_data)
+        success = EGICloudConnector.del_dns_entry(cloud, "hostname", "domain.", "ip", auth_data)
         self.assertTrue(success)
         eurl = f"{EGICloudConnector.DYDNS_URL}/nic/unregister?fqdn=hostname.domain"
         mock_get.assert_called_with(eurl, headers={'Authorization': 'Bearer access_token'}, timeout=10)