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

diff --combined portal/actions.py
index f57dc46,629dd7c..2707dd4
--- 1/portal/actions.py
--- 2/portal/actions.py
+++ b/portal/actions.py
@@@ -55,14 -55,6 +55,14 @@@ def sfa_add_slice(request, slice_params
          raise Exception, "Could not create %s. Already exists ?" % slice_params['hrn']
      return results
  
 +def sfa_add_authority(request, authority_params):
 +    query = Query.create('authority').set(authority_params).select('authority_hrn')
 +    results = execute_query(request, query)
 +    print "sfa_add_auth results=",results
 +    if not results:
 +        raise Exception, "Could not create %s. Already exists ?" % authority_params['hrn']
 +    return results
 +
  def sfa_add_user_to_slice(request, user_hrn, slice_params):
      query = Query.update('slice').filter_by('user_hrn', '==', user_hrn).set(slice_params).select('slice_hrn')
      results = execute_query(request, query)
@@@ -258,22 -250,18 +258,25 @@@ def portal_validate_request(wsgi_reques
                  }
                  # ignored in request: id, timestamp, password
  
 +                # UPDATE user status = 2 = validated
 +                user_query  = Query().get('local:user').select('config','email','status').filter_by('email', '==', request['email'])
 +                user_details = execute_admin_query(request, user_query)
 +                print user_details[0]
 +                manifold_user_params = {
 +                    'status': 2
 +                }
 +                manifold_update_user(request, request['email'], manifold_user_params) 
 + 
                  sfa_add_user(wsgi_request, sfa_user_params)
 -
 -                # XXX Remove from database
 -
 +               # XXX Remove from database
  
                  request_status['SFA user'] = {'status': True }
  
              except Exception, e:
                  request_status['SFA user'] = {'status': False, 'description': str(e)}
+             
+             user_params = {'status':2}
+             manifold_update_user(request, request['email'],user_params)
  
              # MANIFOLD user should be added beforehand, during registration
              #try:
@@@ -308,35 -296,15 +311,35 @@@
  
                  sfa_add_slice(wsgi_request, sfa_slice_params)
                  #sfa_add_user_to_slice(wsgi_request, user_hrn, sfa_slice_params)
 -
 -                # XXX Remove from database
 -
 -            
                  request_status['SFA slice'] = {'status': True }
  
              except Exception, e:
                  request_status['SFA slice'] = {'status': False, 'description': str(e)}
  
 +        elif request['type'] == 'authority':
 +            try:
 +                #hrn = "%s.%s" % (request['authority_hrn'], request['site_authority'])
 +                hrn = request['site_authority']
 +                # XXX tmp sfa dependency
 +                from sfa.util.xrn import Xrn 
 +                urn = Xrn(hrn, request['type']).get_urn()
 +
 +                sfa_authority_params = {
 +                    'hrn'        : hrn,
 +                    'urn'        : urn,
 +                    'type'       : request['type'],
 +                    #'pi'        : None,
 +                    'enabled'    : True
 +                }
 +                print "ADD Authority"
 +                sfa_add_authority(wsgi_request, sfa_authority_params)
 +                request_status['SFA authority'] = {'status': True }
 +
 +            except Exception, e:
 +                request_status['SFA authority'] = {'status': False, 'description': str(e)}
 +
 +        # XXX Remove from Pendings in database
 +
          status['%s__%s' % (request['type'], request['id'])] = request_status
  
      return status