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

Conflicts:
	rest/sfa_api.py

diff --cc rest/sfa_api.py
index 42b26f5,39ede6a..b35fa35
--- 1/rest/sfa_api.py
--- 2/rest/sfa_api.py
+++ b/rest/sfa_api.py
@@@ -2,41 -2,40 +2,44 @@@ import o
  import json
  import ConfigParser 
  import datetime
 -from time                       import mktime
 +from time                           import mktime
 +import time
  import xmltodict
  
 -from django.shortcuts           import render_to_response
 -from django.http                import HttpResponse
 +from django.shortcuts               import render_to_response
 +from django.http                    import HttpResponse,QueryDict
  
 -from sfa.trust.certificate      import Keypair, Certificate
 -from sfa.client.sfaserverproxy  import SfaServerProxy
 -from sfa.client.return_value    import ReturnValue
 -from sfa.util.xrn               import Xrn, get_leaf, get_authority, hrn_to_urn, urn_to_hrn
 +from sfa.trust.certificate          import Keypair, Certificate
 +from sfa.client.sfaserverproxy      import SfaServerProxy
 +from manifold.gateways.sfa.proxy    import SFAProxy
 +from sfa.client.return_value        import ReturnValue
 +from sfa.util.xrn                   import Xrn, get_leaf, get_authority, hrn_to_urn, urn_to_hrn
  
 -from manifold.core.query        import Query
 -from manifold.operators.rename  import do_rename
 +from manifold.core.query            import Query
  
 -from manifoldapi.manifoldapi    import execute_admin_query
 +from manifoldapi.manifoldapi        import execute_admin_query
  
 -from unfold.loginrequired       import LoginRequiredView
 +from unfold.loginrequired           import LoginRequiredView
  
 -from myslice.settings           import logger, config
 +from myslice.settings               import logger, config
  
 -from rest.json_encoder          import MyEncoder
 +from repoze.lru                     import lru_cache
 +from rest.json_encoder              import MyEncoder
  
+ import uuid
+ def unique_call_id(): return uuid.uuid4().urn
+ 
  def dispatch(request, method):
  
 -    hrn = ''
 -    urn = ''
 -    object_type = ''
 +    hrn = None
 +    urn = None
 +    object_type = None
      rspec = None
 +    output_format = None
      recursive = False
 -    options   = dict()
 -    platforms = list()
 +    # Have to be hashable for lru_cache
 +    options   = frozenset() # dict()
 +    platforms = frozenset() # list()
  
      results = dict()
      display = None
@@@ -46,35 -45,39 +49,45 @@@
      elif request.method == 'GET':
          req_items = request.GET
  
-     logger.debug("URL = %s" % request.build_absolute_uri())
- 
-     for el in req_items.items():
-         if el[0].startswith('rspec'):
-             rspec += el[1]
-         elif el[0].startswith('platform'):
-             platforms = frozenset(req_items.getlist('platform[]'))
-         elif el[0].startswith('options'):
-             options_url = el[1] #req_items.getlist('options')
-             options = QueryDict(options_url)
-         elif el[0].startswith('output_format'):
-             output_format = el[1] #req_items.getlist('options')
-         elif el[0].startswith('hrn'):
-             hrn = el[1]
-         elif el[0].startswith('urn'):
-             urn = el[1]
-         elif el[0].startswith('type'):
-             object_type = el[1]
-         elif el[0].startswith('recursive'):
-             if el[1] == '1':
+     logger.debug("dispatch got = %s" % req_items.dict())
+     #t = dict(req_items.iterlists())
+     #rspec = req_items.getlist('rspec')
+     #logger.debug("dispatch got = %s" % t)
+ 
+     platforms = req_items.getlist('platform[]')
 -    logger.debug("req_items type = %s" % type(req_items.dict()))
+     for k in req_items.dict():
 -        logger.debug(k)
++        logger.debug("key = %s - value = %s" % (k,req_items.get(k)))
+         if k == 'rspec':
+             rspec = req_items.get(k)
++        if k == 'options':
++            options = req_items.get(k)
++        if k == 'output_format':
++            output_format = req_items.get(k)
+         if k == 'hrn':
+             hrn = req_items.get(k)
+         if k == 'urn':
+             urn = req_items.get(k)
+         if k == 'type':
+             object_type = req_items.get(k)
+         if k == 'recursive':
+             if v == '1':
                  recursive = True
              else:
                  recursive = False
-         elif el[0].startswith('display'):
-             display = el[1]
+         if k == 'display':
+             display = req_items.get(k)
+ 
+     if rspec is not None:
+         try:
+             rspec = json.loads(rspec)
+         except Exception,e:
+             logger.debug("rspec type = %s" % type(rspec))
+         if type(rspec) is dict:
+             rspec = xmltodict.unparse(rspec)
 -    results = sfa_client(request, method, hrn=hrn, urn=urn, object_type=object_type, rspec=rspec, recursive=recursive, options=options, platforms=platforms)
 +
 +    start_time = time.time()
-     results = sfa_client(request, method, hrn, urn, object_type, rspec, recursive, options, platforms, output_format, False)
++    results = sfa_client(request, method, hrn=hrn, urn=urn, object_type=object_type, rspec=rspec, recursive=recursive, options=options, platforms=platforms, output_format=output_format, admin=False)
 +    logger.debug("EXEC TIME - sfa_client() - %s sec." % (time.time() - start_time))
      if display == 'table':
          return render_to_response('table-default.html', {'data' : data, 'fields' : columns, 'id' : '@component_id', 'options' : None})
      else:
@@@ -189,24 -193,6 +204,22 @@@ def sfa_client(request, method, hrn=Non
               return {'error' : '-2'}
   
          server = SfaServerProxy(server_url, pkey, cert)
-             logger.debug(result)
-             logger.debug(result['value'])
 +        #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'}
  
          try:
              # Get user config from Manifold
@@@ -363,13 -337,6 +378,14 @@@
                          #return HttpResponse(json.dumps({'error' : '-3','msg':'method not supported by Registry'}), content_type="application/json")
                          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
 +                    start_time = time.time()
 +                    result = translate(result['value'],output_format)
 +                    logger.debug("EXEC TIME - translate() - %s sec." % (time.time() - start_time))
  
              results[pf] = result
              if dict_result:
@@@ -387,18 -354,30 +403,42 @@@
      results['columns'] = columns
      return results
  
 +@lru_cache(100)
 +def translate(rspec, output_format):
 +    import urllib
 +    import urllib2
 +
 +    values = {'content' : rspec}
 +    url = 'https://demo.fiteagle.org/omnweb/convert/to/' + output_format
 +    data = urllib.urlencode(values)
 +    req = urllib2.Request(url, data)
 +    response = urllib2.urlopen(req)
 +    return response.read()
 +
+ def rename(self,key,new_key):
+     ind = self._keys.index(key)  #get the index of old key, O(N) operation
+     self._keys[ind] = new_key    #replace old key with new key in self._keys
+     self[new_key] = self[key]    #add the new key, this is added at the end of self._keys
+     self._keys.pop(-1)           #pop the last item in self._keys
+ 
+ def get_users_in_slice(request, slice_hrn):
+     # select users.user_hrn, users.user_email, users.keys  
+     # from myslice:slice 
+     # where slice_hrn=='onelab.upmc.r2d2.slice1'
+     users_query  = Query().get('myslice:slice').filter_by('slice_hrn', '==', slice_hrn).select('users.user_hrn', 'users.user_urn', 'users.user_email','users.keys')
+     users = execute_admin_query(request, users_query)
+     rmap = {'user_urn':'urn','user_email':'email','user_hrn':'hrn'}
+     res = list()
+     for u in users[0]['users']:
+         r_user = dict()
+         for k,v in u.items():
+             if k in rmap.keys():
+                 r_user[rmap[k]] = v
+             else:
+                 r_user[k]=v
+         res.append(r_user)
+     return res
+ 
  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 {}