Merge pull request #672 from enolfc/egi-images

Move from appdb:// to egi://

Author: micafer

app/__init__.py

@@ -1104,7 +1104,7 @@ def createdep():
                         pub_network_id = site["networks"][vo]["public"]
 
             if form_data.get('extra_opts.selectedImage', "") != "" and 'name' in site:
-                image = "appdb://%s/%s?%s" % (site['name'], form_data['extra_opts.selectedImage'], vo)
+                image = "egi://%s/%s?%s" % (site['name'], form_data['extra_opts.selectedImage'], vo)
             elif form_data.get('extra_opts.selectedSiteImage', "") != "":
                 image = form_data['extra_opts.selectedSiteImage']
         else:

app/cloud_info.py

@@ -70,7 +70,7 @@ def get_images(site_name, vo):
     images = set()
     data = cloudinfo_call(cloudinfo_url)
     if data:
-        images = set([(img["name"], img["appdb_id"]) for img in data])
+        images = set([(img["name"], img["egi_id"]) for img in data])
     return list(images)
 
 

app/tests/test_cloud_info.py

@@ -118,7 +118,7 @@ def test_get_images(self, cloudinfo_call):
         images = """[
             {
                 "name": "ScipionCloud-GPU",
-                "appdb_id": "scipioncloud.gpu",
+                "egi_id": "scipioncloud.gpu",
                 "id": "cea20767-9a69-46b2-aa7f-3da2f5857f1b",
                 "mpuri": "https://appdb.egi.eu/store/vo/image/57bb9e4e-0d8d-5eff-aff1-57aa65e32c5c:15494/"
             }