From: Loic Baron <loic.baron@lip6.fr>
Date: Fri, 4 Dec 2015 09:49:58 +0000 (+0100)
Subject: Cloud plugin: handle error if AM is down
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=644807d55e9435d9c20e1075c7b41a7e507c552d

Cloud plugin: handle error if AM is down
---

diff --git a/portal/slicetabcloud.py b/portal/slicetabcloud.py
index ce1dc31d..5f151093 100644
--- a/portal/slicetabcloud.py
+++ b/portal/slicetabcloud.py
@@ -18,6 +18,8 @@ from myslice.theme import ThemeView
 from myslice.configengine import ConfigEngine
 from myslice.settings import logger
 
+from rest.sfa_api import sfa_client
+
 from sfa.planetlab.plxrn import hash_loginbase
 
 import urllib2,json
@@ -41,7 +43,7 @@ class CloudView (LoginRequiredView, ThemeView):
 
         username = self.request.user    
         platforms = self.get_platforms(request)
-        cloud_platforms = ["onelab-cloud"]
+        cloud_platforms = ["onelab-cloud","fuseco"]
         len_platforms = len(platforms)
 
         #if 'action' in request.POST:
@@ -72,12 +74,20 @@ class CloudView (LoginRequiredView, ThemeView):
   
         username = self.request.user    
         platforms = self.get_platforms(request)
-        cloud_platforms = ["onelab-cloud"]
+        cloud_platforms = ["onelab-cloud","fuseco"]
         len_platforms = len(platforms)
+        result = sfa_client(request,'ListResources',platforms=cloud_platforms)
+
+        # Handle errors in ListResources, example AM is down
+        for key, value in result.iteritems():
+            logger.debug("key in result = %s" % key)
+            if 'error' in value:
+                cloud_platforms.remove(key)
 
         env = { 'theme' : self.theme,
                 'slicename':slicename, 
                 'platforms':platforms,
+                'result':result,
                 'cloud_platforms':cloud_platforms,
                 'len_platforms': len_platforms,
                 'request':self.request,