X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=rest%2Fsfa_api.py;h=cc9f9a1ea7d79e5fc05a4cd1ffdcd2b3ae97d2c3;hb=d035a1f93e4acbeee79b7c8200264687d940ccc2;hp=f4eafd22c587504350dc1e52f624bf2b940a1fa7;hpb=13f060d0ef33b6a6069fe47fc9b1d2ac16eab051;p=myslice.git

diff --git a/rest/sfa_api.py b/rest/sfa_api.py
index f4eafd22..cc9f9a1e 100644
--- a/rest/sfa_api.py
+++ b/rest/sfa_api.py
@@ -130,7 +130,7 @@ def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None
             raise Exception, "Provide urn OR hrn + type as parameters of method %s" % method
 
     if len(platforms)==0:
-        platforms = get_platforms()
+        platforms = get_platforms(request)
         #platforms.append('myslice')
     #results = {'method':method,'platforms':platforms,'rspec':rspec,'options':options}
 
@@ -143,7 +143,7 @@ def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None
     api_options['list_leases'] = 'all'
     server_am = False
     for pf in platforms:
-        platform = get_platform_config(pf)
+        platform = get_platform_config(request, pf)
         logger.debug("platform={}".format(platform))
         if 'sm' in platform and len(platform['sm']) > 0:
             logger.debug('sm')
@@ -186,6 +186,7 @@ def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None
             elif 'user_credential' in user_config:
                 user_cred = user_config['user_credential']
             else:
+                logger.error("no user credentials for user = ", user_email)
                 user_cred = {}
 
             if object_type:
@@ -197,6 +198,11 @@ def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None
                     for obj_name, cred in user_config['%s_credentials'%object_type].items():
                         if obj_name == hrn:
                             object_cred = cred
+                else:
+                    logger.error("no credentials for object")
+                    logger.error(object_type)
+                    logger.error(object_name)
+                    object_cred = {}
 
             # Both AM & Registry
             if method == "GetVersion": 
@@ -206,6 +212,7 @@ def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None
                 if server_am:
                     if method == "ListResources":
                         result = server.ListResources([user_cred], api_options)
+                        logger.debug(result)
                         dict_result = xmltodict.parse(result['value'])
                         result['parsed'] = dict_result
                         if isinstance(dict_result['rspec']['node'], list):
@@ -225,7 +232,9 @@ def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None
                         # else GetVersion = v3
                         else:
                             result = server.Describe([urn] ,[object_cred], api_options)
-                            dict_result = xmltodict.parse(result['value']['geni_rspec'])
+                            if isinstance(result, dict):
+                                if result['value'] != 0:
+                                    dict_result = xmltodict.parse(result['value']['geni_rspec'])
 
                         result['parsed'] = dict_result
                         if 'rspec' in dict_result and 'node' in dict_result['rspec']:
@@ -242,28 +251,35 @@ def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None
                     elif method == 'Delete':
                         result = server.Delete([urn] ,[object_cred], api_options)
                     elif method == 'Allocate':
-                        # if GetVersion = v2
-                        # CreateSliver(slice_hrn)
-                        # else GetVersion = v3
                         api_options['call_id']    = unique_call_id()
                         # List of users comes from the Registry
                         api_options['sfa_users']  = sfa_users
                         api_options['geni_users'] = geni_users
-                        result = server.Allocate([urn] ,[object_cred], rspec, api_options)
+                        # if GetVersion = v2
+                        version = server.GetVersion()
+                        if version['geni_api'] == 2:
+                            result = server.CreateSliver([urn] ,[object_cred], rspec, api_options)
+                        # else GetVersion = v3
+                        else:
+                            result = server.Allocate([urn] ,[object_cred], rspec, api_options)
                     elif method == 'Provision':
                         # if GetVersion = v2
                         # Nothing it is not supported by v2 AMs
-                        api_options['call_id']    = unique_call_id()
-                        # List of users comes from the Registry
-                        api_options['sfa_users']  = sfa_users
-                        api_options['geni_users'] = geni_users
-                        result = server.Provision([urn] ,[object_cred], api_options)
+                        version = server.GetVersion()
+                        if version['geni_api'] == 3:
+                            api_options['call_id']    = unique_call_id()
+                            # List of users comes from the Registry
+                            api_options['sfa_users']  = sfa_users
+                            api_options['geni_users'] = geni_users
+                            result = server.Provision([urn] ,[object_cred], api_options)
                     elif method == 'Status':
                         result = server.Status([urn] ,[object_cred], api_options)
                     elif method == 'PerformOperationalAction':
                         # if GetVersion = v2
                         # Nothing it is not supported by v2 AMs
-                        result = server.PerformOperationalAction([urn] ,[object_cred], action, api_options)
+                        version = server.GetVersion()
+                        if version['geni_api'] == 3:
+                            result = server.PerformOperationalAction([urn] ,[object_cred], action, api_options)
                     elif method == 'Shutdown':
                         result = server.Shutdown(urn ,[object_cred], api_options)
                     else:
@@ -326,7 +342,7 @@ def get_user_config(request, user_email, platform_name):
     account = get_user_account(request, user_email, platform_name)
     return json.loads(account['config']) if account['config'] else {}
 
-def get_platforms():
+def get_platforms(request):
     ret = list()
     platform_query  = Query().get('local:platform').filter_by('gateway_type', '==', 'sfa').filter_by('disabled','==',0).select('platform')
     platforms = execute_admin_query(request, platform_query)
@@ -335,8 +351,7 @@ def get_platforms():
         ret.append(p['platform'])
     return ret
 
-
-def get_platform_config(platform_name):
+def get_platform_config(request, platform_name):
     platform_query  = Query().get('local:platform').filter_by('platform', '==', platform_name).select('platform', 'config')
     platforms = execute_admin_query(request, platform_query)