Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

diff --combined rest/sfa_api.py
index 45e30a1,cacf7fe..0a84093
--- 1/rest/sfa_api.py
--- 2/rest/sfa_api.py
+++ b/rest/sfa_api.py
@@@ -203,23 -203,23 +203,23 @@@ def sfa_client(request, method, hrn=Non
               #return HttpResponse(json.dumps({'error' : '-2'}), content_type="application/json")
               return {'error' : '-2'}
   
-         server = SfaServerProxy(server_url, pkey, cert)
+         server = SfaServerProxy(server_url, pkey, cert, verbose=False)#, timeout=5)
          #server = SFAProxy(server_url, pkey, cert)
-         if 'geni_rspec_version' in options:
-             # GetVersion to know if the AM supports the requested version
-             # if not ask for the default GENI v3
-             start_time = time.time()
-             result = server.GetVersion()
-             logger.debug("EXEC TIME - GetVersion() - %s sec." % (time.time() - start_time))
-             if 'geni_ad_rspec_versions' in result['value']:
-                 for v in result['value']['geni_ad_rspec_versions']:
-                     if v['type'] == options['geni_rspec_version']:
-                         api_options['geni_rspec_version'] = {'type': options['geni_rspec_version']}
-                         break
-                     else:
-                         api_options['geni_rspec_version'] = {'type': 'GENI', 'version': '3'}
-         else:
-             api_options['geni_rspec_version'] = {'type': 'GENI', 'version': '3'}
+         #if 'geni_rspec_version' in api_options:
+         #    # GetVersion to know if the AM supports the requested version
+         #    # if not ask for the default GENI v3
+         #    start_time = time.time()
+         #    result = server.GetVersion()
+         #    logger.debug("EXEC TIME - GetVersion() - %s sec." % (time.time() - start_time))
+         #    if 'geni_ad_rspec_versions' in result['value']:
+         #        for v in result['value']['geni_ad_rspec_versions']:
+         #            if v['type'] == api_options['geni_rspec_version']:
+         #                api_options['geni_rspec_version'] = {'type': api_options['geni_rspec_version']}
+         #                break
+         #            else:
+         #                api_options['geni_rspec_version'] = {'type': 'GENI', 'version': '3'}
+         #else:
+         #    api_options['geni_rspec_version'] = {'type': 'GENI', 'version': '3'}
  
          try:
              # Get user config from Manifold
@@@ -260,12 -260,9 +260,9 @@@
                  # AM API Calls
                  if server_am:
                      if method == "ListResources":
-                         logger.debug(api_options)
-                         #logger.debug(user_cred)
                          start_time = time.time()
                          result = server.ListResources([user_cred], api_options)
                          logger.debug("EXEC TIME - ListResources() - %s sec." % (time.time() - start_time))
-                         #logger.debug(result)
                          dict_result = xmltodict.parse(result['value'])
                          result['parsed'] = dict_result
                          if isinstance(dict_result['rspec']['node'], list):
@@@ -283,7 -280,6 +280,7 @@@
                              # ListResources(slice_hrn)
                              api_options['geni_slice_urn'] = urn
                              result = server.ListResources([object_cred], api_options)
 +                            logger.debug(result)
                              dict_result = xmltodict.parse(result['value'])
                          # else GetVersion = v3
                          else:
@@@ -380,7 -376,6 +377,6 @@@
                          logger.debug('method %s not handled by Registry' % method)
                          result = []
              if output_format is not None:
-                 logger.debug("result = " % result)
                  if 'value' in result:
                      # TODO Python Caching 
                      # to avoid translating the same RSpec in the same format several times