X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=blobdiff_plain;f=portal%2Factions.py;h=7289594496f052bd9caf36f005db0c3519dc0b35;hp=5699562722b45dbe6116a1355a63536f302dff30;hb=6199416c7ec88da73bce3165592106459a29887b;hpb=83f3bc8abee6f1312ad9a0a24e63871fc1ee8b16 diff --git a/portal/actions.py b/portal/actions.py index 56995627..72895944 100644 --- a/portal/actions.py +++ b/portal/actions.py @@ -4,8 +4,10 @@ from manifold.manifoldapi import execute_query from portal.models import PendingUser, PendingSlice import json -# XXX sfa dependency, should be moved to SFA gateway -from sfa.util.xrn import Xrn +# Thierry: moving this right into the code so +# most people can use myslice without having to install sfa +# XXX tmp sfa dependency, should be moved to SFA gateway +#from sfa.util.xrn import Xrn # Get the list of authorities @@ -172,6 +174,8 @@ def portal_validate_request(wsgi_request, request_ids): try: hrn = "%s.%s" % (request['authority_hrn'], request['login']) + # XXX tmp sfa dependency + from sfa.util.xrn import Xrn urn = Xrn(hrn, request['type']).get_urn() sfa_user_params = { @@ -215,6 +219,8 @@ def portal_validate_request(wsgi_request, request_ids): elif request['type'] == 'slice': try: hrn = "%s.%s" % (request['authority_hrn'], request['slice_name']) + # XXX tmp sfa dependency + from sfa.util.xrn import Xrn urn = Xrn(hrn, request['type']).get_urn() sfa_slice_params = {