if platform_detail['platform_id'] == account_detail['platform_id']:
if 'myslice' in platform_detail['platform']:
account_config = json.loads(account_detail['config'])
- user_cred = account_config.get('delegated_user_credential','N/A')
+ #user_cred = account_config.get('delegated_user_credential','N/A')
+ user_cred = account_config.get('user_credential','N/A')
if 'N/A' not in user_cred:
user_hrn = account_config.get('user_hrn','N/A')
user_pub_key = json.dumps(account_config.get('user_public_key','N/A'))
for user in user_details_sfa:
user_email = user['user_email']
+ # XXX LOIC Quick fix because this is totally inconsistent
+ if not 'number_of_nodes' in request:
+ request['number_of_nodes']=""
+
# XXX We should create a slice with Manifold terminology
slice_params = {
'slice_hrn' : hrn,
'slice_urn' : urn,
'slice_type' : request['type'],
+ 'url' : request['number_of_nodes'],
'users' : user_hrns,
'slice_enabled' : True
}
slice_name = request['slice_name'],
user_hrn = request['user_hrn'],
authority_hrn = request['authority_hrn'],
- number_of_nodes = request['exp_url'],
+ number_of_nodes = request['url'],
purpose = request['purpose'],
)
s.save()
query = Query.create('%s:user' % namespace).set(sfa_user_params).select('user_hrn')
else:
query = Query.create('user').set(sfa_user_params).select('user_hrn')
+
if as_admin:
- results = execute_query(wsgi_request, query)
- else:
results = execute_admin_query(wsgi_request, query)
+ else:
+ results = execute_query(wsgi_request, query)
if not results:
raise Exception, "Could not create %s. Already exists ?" % sfa_user_params['user_hrn']
return results
def create_user(wsgi_request, request, namespace = None, as_admin = False):
-
# XXX This has to be stored centrally
USER_STATUS_ENABLED = 2