Merge pull request #531 from grycap/egi_brand_v2

Egi brand v2

app/__init__.py

@@ -309,7 +309,7 @@ def showvminfo():
                     if cont > 0:
                         nets += Markup('<br/>')
                     nets += Markup('<i class="fa fa-network-wired"></i>')
-                    nets += Markup(' <span class="badge badge-secondary">%s</span>' % cont)
+                    nets += Markup(' <span class="badge bg-secondary">%s</span>' % cont)
                     nets += ": %s" % vminfo["net_interface.%s.ip" % cont]
                     del vminfo["net_interface.%s.ip" % cont]
                     if "net_interface.%s.dns_name" % cont in vminfo:
@@ -337,7 +337,7 @@ def showvminfo():
             while "disk.%s.size" % cont in vminfo or "disk.%s.image.url" % cont in vminfo:
                 if cont > 0:
                     disks += Markup('<br/>')
-                disks += Markup('<i class="fa fa-database"></i> <span class="badge badge-secondary">'
+                disks += Markup('<i class="fa fa-database"></i> <span class="badge bg-secondary">'
                                 '%s</span><br/>' % cont)
 
                 prop_map = {"size": "Size", "image.url": "URL", "device": "Device", "mount_path": "Mount Path",
@@ -367,14 +367,14 @@ def showvminfo():
                     if port.get_remote_cidr() != "0.0.0.0/0":
                         remote_cidr = "%s-" % port.get_remote_cidr()
                     str_outports += Markup('<i class="fas fa-project-diagram"></i> <span class="badge '
-                                           'badge-secondary">%s%s</span>' % (remote_cidr, port.get_remote_port()))
+                                           'bg-secondary">%s%s</span>' % (remote_cidr, port.get_remote_port()))
                     if not port.is_range():
                         if port.get_remote_port() != port.get_local_port():
                             str_outports += Markup(' <i class="fas fa-long-arrow-alt-right">'
-                                                   '</i> <span class="badge badge-secondary">%s</span>' %
+                                                   '</i> <span class="badge bg-secondary">%s</span>' %
                                                    port.get_local_port())
                     else:
-                        str_outports += Markup(' : </i> <span class="badge badge-secondary">%s</span>' %
+                        str_outports += Markup(' : </i> <span class="badge bg-secondary">%s</span>' %
                                                port.get_local_port())
                     str_outports += Markup('<br/>')
 

app/appdb.py

@@ -24,7 +24,6 @@
 from urllib.parse import urlparse
 
 APPDB_URL = "https://appdb.egi.eu"
-VO_LIST = []
 APPDB_TIMEOUT = 10
 
 
@@ -45,18 +44,15 @@ def appdb_call(path, retries=3, url=APPDB_URL, timeout=APPDB_TIMEOUT):
 
 
 def get_vo_list():
-    global VO_LIST
-    if not VO_LIST:
-        vos = []
-        data = appdb_call('/rest/1.0/vos')
-        if data:
-            if isinstance(data['vo:vo'], list):
-                for vo in data['vo:vo']:
-                    vos.append(vo['@name'])
-            else:
-                vos.append(data['vo:vo']['@name'])
-        VO_LIST = vos
-    return VO_LIST
+    vos = []
+    data = appdb_call('/rest/1.0/vos')
+    if data:
+        if isinstance(data['vo:vo'], list):
+            for vo in data['vo:vo']:
+                vos.append(vo['@name'])
+        else:
+            vos.append(data['vo:vo']['@name'])
+    return vos
 
 
 def _get_services(vo=None):

app/db.py

@@ -259,7 +259,7 @@ def table_exists(self, table_name):
             res = self.select('SELECT * FROM information_schema.tables WHERE table_name = %s and table_schema = %s',
                               (table_name, db))
         elif self.db_type == DataBase.MONGO:
-            return table_name in self.connection.collection_names()
+            return table_name in self.connection.list_collection_names()
         else:
             return False
 

app/settings.py

@@ -24,7 +24,7 @@
 class Settings:
     def __init__(self, config):
         """Creator function."""
-        self.version = "2.5.3"
+        self.version = "2.5.6"
         self.toscaDir = config.get('TOSCA_TEMPLATES_DIR', '') + "/"
         self.imUrl = config['IM_URL']
         self.oidcName = config['OIDC_NAME']

app/static/css/regular.min.css

@@ -0,0 +1,6 @@
+/*!
+ * Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ * Copyright 2023 Fonticons, Inc.
+ */
+:host,:root{--fa-style-family-classic:"Font Awesome 6 Free";--fa-font-regular:normal 400 1em/1 "Font Awesome 6 Free"}@font-face{font-family:"Font Awesome 6 Free";font-style:normal;font-weight:400;font-display:block;src:url(../webfonts/fa-regular-400.woff2) format("woff2"),url(../webfonts/fa-regular-400.ttf) format("truetype")}.fa-regular,.far{font-weight:400}

app/static/css/solid.min.css

@@ -0,0 +1,6 @@
+/*!
+ * Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ * Copyright 2023 Fonticons, Inc.
+ */
+:host,:root{--fa-style-family-classic:"Font Awesome 6 Free";--fa-font-solid:normal 900 1em/1 "Font Awesome 6 Free"}@font-face{font-family:"Font Awesome 6 Free";font-style:normal;font-weight:900;font-display:block;src:url(../webfonts/fa-solid-900.woff2) format("woff2"),url(../webfonts/fa-solid-900.ttf) format("truetype")}.fa-solid,.fas{font-weight:900}