Merge pull request #601 from grycap/devel

Add creds cache

app/__init__.py

@@ -498,7 +498,7 @@ def showinfrastructures():
                     app.logger.exception("Error getting vm info: %s" % ex)
                     radl_json = []
                 try:
-                    creds = cred.get_creds(get_cred_id())
+                    creds = utils.get_cache_creds(session, cred, get_cred_id())
                 except Exception as ex:
                     app.logger.exception("Error getting user credentials: %s" % ex)
                     creds = []
@@ -768,7 +768,7 @@ def configure():
             app.logger.debug("Template: " + json.dumps(toscaInfo[selected_tosca]))
 
         try:
-            creds = cred.get_creds(get_cred_id(), 1)
+            creds = utils.get_cache_creds(session, cred, get_cred_id(), 1)
         except Exception as ex:
             flash("Error getting user credentials: %s" % ex, "error")
             creds = []
@@ -1122,7 +1122,7 @@ def manage_creds():
         creds = {}
 
         try:
-            creds = cred.get_creds(get_cred_id())
+            creds = utils.get_cache_creds(session, cred, get_cred_id())
             # Get the project_id in case it has changed
             utils.get_project_ids(creds)
         except Exception as e:
@@ -1176,6 +1176,9 @@ def write_creds():
                 if val_res != 1:
                     # Get project_id to save it to de DB
                     utils.get_project_ids([creds])
+                    # delete cached credentials
+                    if 'creds' in session:
+                        del session['creds']
                     cred.write_creds(creds["id"], get_cred_id(), creds, cred_id in [None, ''])
                     if val_res == 0:
                         flash("Credentials successfully written!", 'success')
@@ -1192,6 +1195,9 @@ def delete_creds():
 
         cred_id = request.args.get('cred_id', "")
         try:
+            # delete cached credentials
+            if 'creds' in session:
+                del session['creds']
             cred.delete_cred(cred_id, get_cred_id())
             flash("Credentials successfully deleted!", 'success')
         except Exception as ex:
@@ -1209,6 +1215,9 @@ def enable_creds():
                 val_res, val_msg = cred.validate_cred(get_cred_id(), cred_id)
                 if val_res == 2:
                     flash(val_msg, 'warning')
+            # delete cached credentials
+            if 'creds' in session:
+                del session['creds']
             cred.enable_cred(cred_id, get_cred_id(), enable)
         except Exception as ex:
             flash("Error updating credentials %s!" % ex, 'error')

app/utils.py

@@ -982,3 +982,9 @@ def merge_templates(template, new_template):
         template["metadata"]["tabs"].update(tabs)
 
     return template
+
+
+def get_cache_creds(session, cred, userid, enabled=None):
+    if "creds" not in session:
+        session["creds"] = cred.get_creds(userid, enabled)
+    return session["creds"]