Merge pull request #1686 from grycap/dydns

Fix EGI dns ops to work as default case

Author: micafer

IM/connectors/EGI.py

@@ -30,49 +30,49 @@ class EGICloudConnector(CloudConnector):
     DYDNS_URL = "https://nsupdate.fedcloud.eu"
     DEFAULT_TIMEOUT = 10
 
-    def _get_domains(self, token):
+    @staticmethod
+    def _get_domains(token):
         """
         List the domains available in the DyDNS service
         """
-        url = f'{self.DYDNS_URL}/nic/domains'
-        resp = requests.get(url, headers={'Authorization': f'Bearer {token}'}, timeout=self.DEFAULT_TIMEOUT)
+        url = f'{EGICloudConnector.DYDNS_URL}/nic/domains'
+        resp = requests.get(url, headers={'Authorization': f'Bearer {token}'},
+                            timeout=EGICloudConnector.DEFAULT_TIMEOUT)
         if resp.status_code != 200:
-            self.log_error(f"Error getting domains: {resp.text}")
-            return None
+            return None, resp.text
         output = resp.json()
         if output.get("status") != "ok":
-            self.log_error(f"Error getting domains: {output.get('message', 'Unknown error')}")
-            return None
+            return None, output.get('message', 'Unknown error')
         domains = []
         for domain in output.get("private", []) + output.get("public", []):
             if domain.get("available"):
                 domains.append(domain["name"])
-        return domains
+        return domains, ""
 
-    def _get_host(self, hostname, domain, token):
+    @staticmethod
+    def _get_host(hostname, domain, token):
         """
         Look for a host registered in the DyDNS service
         """
         if hostname == "*":
             parts = domain.split(".")
             domain = ".".join(parts[1:])
             hostname = parts[0]
-        url = f'{self.DYDNS_URL}/nic/hosts?domain={domain}'
-        resp = requests.get(url, headers={'Authorization': f'Bearer {token}'}, timeout=self.DEFAULT_TIMEOUT)
+        url = f'{EGICloudConnector.DYDNS_URL}/nic/hosts?domain={domain}'
+        resp = requests.get(url, headers={'Authorization': f'Bearer {token}'},
+                            timeout=EGICloudConnector.DEFAULT_TIMEOUT)
         if resp.status_code != 200:
-            self.log_error(f"Error getting host {hostname}.{domain}: {resp.text}")
-            return None
+            return None, resp.text
 
         output = resp.json()
         if output.get("status") != "ok":
-            self.log_error(f"Error getting host {hostname}.{domain}: {output.get('message', 'Unknown error')}")
-            return None
+            return None, output.get('message', 'Unknown error')
 
         for host in output.get("hosts", []):
             if host.get("name") == hostname:
-                return host
+                return host, ""
 
-        return None
+        return None, ""
 
     def add_dns_entry(self, hostname, domain, ip, auth_data, extra_args=None):
         """
@@ -85,7 +85,9 @@ def add_dns_entry(self, hostname, domain, ip, auth_data, extra_args=None):
                 self.log_debug(f"Registering DNS entry {hostname}.{domain} with DyDNS oauth token")
                 token = im_auth[0].get("token")
                 # Check if the host already exists
-                host = self._get_host(hostname, domain, token)
+                host, error = EGICloudConnector._get_host(hostname, domain, token)
+                if error:
+                    self.log_error(f"Error getting host {hostname}.{domain}: {error}")
                 if host:
                     self.log_debug(f"DNS entry {hostname}.{domain} already exists")
                     if ip in [host.get("ipv4"), host.get("ipv6")]:
@@ -94,9 +96,10 @@ def add_dns_entry(self, hostname, domain, ip, auth_data, extra_args=None):
                 else:
                     commennt = 'IM created DNS entry'
                     if hostname == "*":
-                        url = f'{self.DYDNS_URL}/nic/register?fqdn={domain}&comment={commennt}&wildcard=true'
+                        url = (f'{EGICloudConnector.DYDNS_URL}/nic/register?fqdn=' +
+                               f'{domain}&comment={commennt}&wildcard=true')
                     else:
-                        url = f'{self.DYDNS_URL}/nic/register?fqdn={hostname}.{domain}&comment={commennt}'
+                        url = f'{EGICloudConnector.DYDNS_URL}/nic/register?fqdn={hostname}.{domain}&comment={commennt}'
                     resp = requests.get(url, headers={'Authorization': f'Bearer {token}'}, timeout=self.DEFAULT_TIMEOUT)
                     if resp.status_code != 200:
                         self.log_error(f"Error registering DNS entry {hostname}.{domain}: {resp.text}")
@@ -126,8 +129,8 @@ def add_dns_entry(self, hostname, domain, ip, auth_data, extra_args=None):
             fqdn = f'{hostname}.{domain}'
             if hostname == "*":
                 fqdn = domain
-            url = f'{self.DYDNS_URL}/nic/update?hostname={fqdn}&myip={ip}'
-            resp = requests.get(url, headers=headers, timeout=self.DEFAULT_TIMEOUT)
+            url = f'{EGICloudConnector.DYDNS_URL}/nic/update?hostname={fqdn}&myip={ip}'
+            resp = requests.get(url, headers=headers, timeout=EGICloudConnector.DEFAULT_TIMEOUT)
             if resp.status_code != 200:
                 self.log_error(f"Error updating DNS entry {hostname}.{domain}: {resp.text}")
                 return False
@@ -146,21 +149,26 @@ def del_dns_entry(self, hostname, domain, ip, auth_data, extra_args=None):
                 self.log_debug(f"Deleting DNS entry {hostname}.{domain} with DyDNS oauth token")
                 token = im_auth[0].get("token")
 
-                domains = self._get_domains(token)
+                domains, error = EGICloudConnector._get_domains(token)
+                if error:
+                    self.log_error(f"Error getting domains: {error}")
                 if domain not in domains:
                     self.log_debug(f"Domain {domain} not found in DyDNS service")
                     return False
 
-                host = self._get_host(hostname, domain, token)
+                host, error = EGICloudConnector._get_host(hostname, domain, token)
+                if error:
+                    self.log_error(f"Error getting host {hostname}.{domain}: {error}")
                 if not host:
                     self.log_debug(f"DNS entry {hostname}.{domain} does not exist. Do not need to delete.")
                     return True
 
                 if hostname == "*":
-                    url = f'{self.DYDNS_URL}/nic/unregister?fqdn={domain}'
+                    url = f'{EGICloudConnector.DYDNS_URL}/nic/unregister?fqdn={domain}'
                 else:
-                    url = f'{self.DYDNS_URL}/nic/unregister?fqdn={hostname}.{domain}'
-                resp = requests.get(url, headers={'Authorization': f'Bearer {token}'}, timeout=self.DEFAULT_TIMEOUT)
+                    url = f'{EGICloudConnector.DYDNS_URL}/nic/unregister?fqdn={hostname}.{domain}'
+                resp = requests.get(url, headers={'Authorization': f'Bearer {token}'},
+                                    timeout=EGICloudConnector.DEFAULT_TIMEOUT)
                 if resp.status_code != 200:
                     self.log_error(f"Error deleting DNS entry {hostname}.{domain}: {resp.text}")
                     return False

test/unit/connectors/EGI.py

@@ -33,7 +33,7 @@ class TestEGIConnector(unittest.TestCase):
     @patch('requests.get')
     @patch('IM.connectors.EGI.EGICloudConnector._get_host')
     def test_add_dns(self, mock_get_host, mock_get):
-        mock_get_host.return_value = None
+        mock_get_host.return_value = None, ""
         mock_get.return_value = MagicMock(status_code=200, json=lambda: {"status": "ok",
                                                                          "host": {"update_secret": "123"}})
         auth_data = Authentication([{'type': 'InfrastructureManager', 'token': 'access_token'}])
@@ -50,7 +50,7 @@ def test_add_dns(self, mock_get_host, mock_get):
     @patch('requests.get')
     @patch('IM.connectors.EGI.EGICloudConnector._get_host')
     def test_add_dydns(self, mock_get_host, mock_get):
-        mock_get_host.return_value = None
+        mock_get_host.return_value = None, ""
         mock_get.return_value = MagicMock(status_code=200, json=lambda: {"status": "ok",
                                                                          "host": {"update_secret": "123"}})
         cloud = EGICloudConnector(None, None)
@@ -65,8 +65,8 @@ def test_add_dydns(self, mock_get_host, mock_get):
     @patch('IM.connectors.EGI.EGICloudConnector._get_host')
     @patch('IM.connectors.EGI.EGICloudConnector._get_domains')
     def test_del_dns(self, mock_get_domains, mock_get_host, mock_get):
-        mock_get_host.return_value = {"name": "hostname"}
-        mock_get_domains.return_value = ["domain"]
+        mock_get_host.return_value = {"name": "hostname"}, ""
+        mock_get_domains.return_value = ["domain"], ""
         mock_get.return_value = MagicMock(status_code=200, json=lambda: {"status": "ok"})
         auth_data = Authentication([{'type': 'InfrastructureManager', 'token': 'access_token'}])
         cloud = EGICloudConnector(None, None)
@@ -79,9 +79,9 @@ def test_del_dns(self, mock_get_domains, mock_get_host, mock_get):
     def test_get_host(self, mock_get):
         mock_get.return_value = MagicMock(status_code=200, json=lambda: {"status": "ok",
                                                                          "hosts": [{"name": "hostname"}]})
-        cloud = EGICloudConnector(None, None)
-        host = EGICloudConnector._get_host(cloud, "hostname", "domain", "access_token")
+        host, error = EGICloudConnector._get_host("hostname", "domain", "access_token")
         self.assertEqual(host["name"], "hostname")
+        self.assertEqual(error, "")
         self.assertEqual(mock_get.call_count, 1)
         eurl = f"{EGICloudConnector.DYDNS_URL}/nic/hosts?domain=domain"
         mock_get.assert_called_with(eurl, headers={'Authorization': 'Bearer access_token'}, timeout=10)
@@ -93,8 +93,8 @@ def test_get_domains(self, mock_get):
                                                                                       "available": True}],
                                                                          "public": [{"name": "domain2",
                                                                                      "available": True}]})
-        cloud = EGICloudConnector(None, None)
-        domains = EGICloudConnector._get_domains(cloud, "access_token")
+        domains, error = EGICloudConnector._get_domains("access_token")
+        self.assertEqual(error, "")
         self.assertEqual(domains, ["domain1", "domain2"])
         self.assertEqual(mock_get.call_count, 1)
         eurl = f"{EGICloudConnector.DYDNS_URL}/nic/domains"