Adapt code to the new fedcloud info

Author: enolfc

IM/InfrastructureManager.py

@@ -29,6 +29,7 @@
 from IM.VMRC import VMRC
 from IM.AppDBIS import AppDBIS
 from IM.AppDB import AppDB
+from IM.FedcloudInfo import FedcloudInfo
 from IM.CloudInfo import CloudInfo
 from IM.auth import Authentication
 from IM.recipe import Recipe
@@ -434,7 +435,7 @@ def systems_with_iis(sel_inf, radl, auth):
             host = None
             if 'host' in appdbis_elem:
                 host = appdbis_elem['host']
-            appdbis_list.append(AppDBIS(host))
+            appdbis_list.append(FedcloudInfo)
 
         systems_with_vmrc = {}
         for system_id in set([d.id for d in radl.deploys if d.vm_number > 0]):
@@ -1488,17 +1489,14 @@ def gen_auth_from_appdb(auth):
             vo = appdbis_auth[0]["vo"]
             # To avoid connecting with AppDBIS again
             del appdbis_auth[0]["vo"]
-            if "host" in appdbis_auth[0]:
-                appdbis = AppDBIS(appdbis_auth[0]["host"])
-            else:
-                appdbis = AppDBIS()
-            InfrastructureManager.logger.debug("Getting auth data from AppDBIS")
-            code, sites = appdbis.get_sites_supporting_vo(vo)
-            if code == 200:
-                for site_name, site_url, project_id in sites:
-                    auth_site = {"id": site_name, "host": site_url, "type": "OpenStack",
+            InfrastructureManager.logger.debug("Getting auth data from Fedcloud IS")
+            sites = FedcloudInfo.get_sites_supporting_vo(vo)
+            if sites:
+                for site in sites:
+                site_name, site_url, project_id in sites:
+                    auth_site = {"id": site["name"], "host": site["url"], "type": "OpenStack",
                                  "username": "egi.eu", "tenant": "openid", "auth_version": "3.x_oidc_access_token",
-                                 "domain": project_id, "password": appdbis_auth[0]["token"], "vo": vo}
+                                 "domain": site["project_id"], "password": appdbis_auth[0]["token"], "vo": vo}
                     auth.auth_list.append(auth_site)
             else:
                 InfrastructureManager.logger.error("Error getting auth data from AppDBIS: %s" % sites)
@@ -1514,13 +1512,13 @@ def translate_egi_to_ost(auth):
                     ost_auth = {'id': auth_item['id'], 'type': 'OpenStack', 'username': 'egi.eu', 'tenant': 'openid',
                                 'password': auth_item['token'], 'auth_version': '3.x_oidc_access_token',
                                 'vo': auth_item['vo']}
-                    site_id = AppDB.get_site_id(auth_item["host"], stype="openstack")
-                    site_url = AppDB.get_site_url(site_id)
+                    site_name = auth_item["host"]
+                    site_url = FedcloudInfo.get_site_url(site_name)
                     if not site_url:
-                        InfrastructureManager.logger.error("Site name '%s' not found at AppDB." % auth_item['host'])
+                        InfrastructureManager.logger.error("Site name '%s' not found at fedcloud IS." % site_name)
                         continue
                     ost_auth['host'] = site_url
-                    projects = AppDB.get_project_ids(site_id)
+                    projects = FedcloudInfo.get_project_ids(site_name)
                     # If the VO does not appear in the project IDs
                     if auth_item['vo'] in projects:
                         ost_auth['domain'] = projects[auth_item['vo']]
@@ -1831,11 +1829,7 @@ def GetCloudImageList(cloud_id, auth, filters=None):
         auth = InfrastructureManager.check_auth_data(auth)
         appdbis_auth = auth.getAuthInfo("AppDBIS")
         if appdbis_auth and "token" in appdbis_auth[0] and cloud_id == appdbis_auth[0]['id']:
-            if "host" in appdbis_auth[0]:
-                appdbis = AppDBIS(appdbis_auth[0]["host"])
-            else:
-                appdbis = AppDBIS()
-            return appdbis.list_images(filters)
+            return FedcloudInfo.list_images(filters)
         else:
             return InfrastructureManager._get_cloud_conn(cloud_id, auth).list_images(auth, filters)
 

IM/connectors/OCCI.py

@@ -149,11 +149,10 @@ def concrete_system(self, radl_system, str_url, auth_data):
             # The url has this format: appdb://UPV-GRyCAP/egi.docker.ubuntu.16.04?fedcloud.egi.eu
             # Get the Site url from the AppDB
             site_name = url[1]
-            site_id = AppDB.get_site_id(site_name)
-            if not site_id:
-                self.log_error("No site ID returned from EGI AppDB for site: %s." % site_name)
+            site_url = FedcloudIS.get_site_url(site_name)
+            if not site_url:
+                self.log_error("No site returned from EGI Fedcloud IS for site: %s." % site_name)
                 return None
-            site_url = AppDB.get_site_url(site_id)
 
         if ((protocol in ['https', 'http'] and url[2] and url[0] + "://" + url[1] == cloud_url) or
                 (protocol == "appdb" and site_url.startswith(cloud_url))):
@@ -782,8 +781,7 @@ def launch(self, inf, radl, requested_radl, num_vm, auth_data):
             site_name = url[1]
             image_name = url[2][1:]
             vo_name = url[4]
-            site_id = AppDB.get_site_id(site_name)
-            os_tpl = AppDB.get_image_id(site_id, image_name, vo_name)
+            os_tpl = AppDB.get_image_id(site_name, image_name, vo_name)
         else:
             # Get the Image ID from the last part of the path
             os_tpl = os.path.basename(url[2])

IM/connectors/OpenStack.py

@@ -47,7 +47,7 @@
     from urllib.parse import urlparse
 from IM.VirtualMachine import VirtualMachine
 from radl.radl import Feature
-from IM.AppDB import AppDB
+from IM.FedcloudInfo import FedcloudInfo
 from IM import get_ex_error
 
 
@@ -360,7 +360,7 @@ def concrete_system(self, radl_system, str_url, auth_data):
         src_host = url[1].split(':')[0]
 
         if protocol == "appdb":
-            site_url, image_id, msg = AppDB.get_image_data(str_url, "openstack", site=self.cloud.server)
+            site_url, image_id, msg = FedcloudInfo.get_image_data(str_url, "openstack", site=self.cloud.server)
             if not image_id or not site_url:
                 self.log_error(msg)
                 return None
@@ -1327,7 +1327,7 @@ def launch(self, inf, radl, requested_radl, num_vm, auth_data):
         image_url = system.getValue("disk.0.image.url")
         if urlparse(image_url)[0] == "appdb":
             vo = self.get_vo_name(auth_data)
-            _, image_id, msg = AppDB.get_image_data(image_url, "openstack", vo, site=self.cloud.server)
+            _, image_id, msg = FedcloudInfo.get_image_data(image_url, "openstack", vo, site=self.cloud.server)
             if not image_id:
                 self.log_error(msg)
                 raise CloudConnectorException("Error in appdb image: %s" % msg)

test/unit/connectors/OCCI.py

@@ -82,9 +82,8 @@ def test_concrete(self):
         self.assertEqual(len(concrete), 1)
         self.assertNotIn("ERROR", self.log.getvalue(), msg="ERROR found in log: %s" % self.log.getvalue())
 
-    @patch('IM.AppDB.AppDB.get_site_id')
     @patch('IM.AppDB.AppDB.get_site_url')
-    def test_concrete_appdb(self, get_site_url, get_site_id):
+    def test_concrete_appdb(self, get_site_url):
         radl_data = """
             network net ()
             system test (
@@ -106,7 +105,6 @@ def test_concrete_appdb(self, get_site_url, get_site_id):
         occi_cloud.cloud.server = "carach5.ics.muni.cz"
 
         get_site_url.return_value = "https://carach5.ics.muni.cz:11443"
-        get_site_id.return_value = "siteid"
         concrete = occi_cloud.concreteSystem(radl_system, auth)
         self.assertEqual(len(concrete), 1)
         self.assertNotIn("ERROR", self.log.getvalue(), msg="ERROR found in log: %s" % self.log.getvalue())

test/unit/connectors/OpenStack.py

@@ -127,11 +127,10 @@ def test_10_concrete(self, get_driver):
         self.assertEqual(concrete[0].getValue("instance_type"), "g.small")
         self.assertNotIn("ERROR", self.log.getvalue(), msg="ERROR found in log: %s" % self.log.getvalue())
 
-    @patch('IM.AppDB.AppDB.get_site_id')
-    @patch('IM.AppDB.AppDB.get_site_url')
-    @patch('IM.AppDB.AppDB.get_image_id')
+    @patch('IM.FedcloudInfo.FedcloudInfo.get_site_url')
+    @patch('IM.FedcloudInfo.FedcloudInfo.get_image_id')
     @patch('libcloud.compute.drivers.openstack.OpenStackNodeDriver')
-    def test_15_concrete_appdb(self, get_driver, get_image_id, get_site_url, get_site_id):
+    def test_15_concrete_appdb(self, get_driver, get_image_id, get_site_url):
         radl_data = """
             network net ()
             system test (
@@ -164,7 +163,6 @@ def test_15_concrete_appdb(self, get_driver, get_image_id, get_site_url, get_sit
         driver.list_sizes.return_value = [node_size]
 
         get_site_url.return_value = "https://server.com:5000"
-        get_site_id.return_value = "8016G0"
         get_image_id.return_value = "imageid1"
         concrete = ost_cloud.concreteSystem(radl_system, auth)
         self.assertEqual(len(concrete), 1)
@@ -185,7 +183,7 @@ def create_node(self, **kwargs):
 
     @patch('libcloud.compute.drivers.openstack.OpenStackNodeDriver')
     @patch('IM.InfrastructureList.InfrastructureList.save_data')
-    @patch('IM.AppDB.AppDB.get_image_data')
+    @patch('IM.FedcloudInfo.FedcloudInfo.get_image_data')
     def test_20_launch(self, get_image_data, save_data, get_driver):
         radl_data = """
             description desc (name = 'SimpleRADL')

test/unit/test_im_logic.py

@@ -1504,7 +1504,6 @@ def test_search_vm(self, dummycc):
 
     @patch('IM.InfrastructureManager.AppDB')
     def test_translate_egi_to_ost(self, appdb):
-        appdb.get_site_id.return_value = 'site_id'
         appdb.get_site_url.return_value = 'https://ostsite.com:5000'
         appdb.get_project_ids.return_value = {'vo_name': 'projectid'}