def get_reserved_nodes(self):
"""
- Get all OAR jobs with state Waiting or Running.
+ Get all OAR jobs not terminated.
:Example:
{"total":"1907",
"""
logger.warning("iotlashell get_reserved_nodes")
reserved_nodes_dict = {}
- request = 'admin/experiments?state=Running,Waiting'
+ request = ('admin/experiments?state='
+ 'Running,Waiting,toAckReservation,'
+ 'toLaunch,Launching')
try:
experiments = self.api.method(request)
except HTTPError as err:
err.reason)
return {'error': err.reason}
for exp in experiments['items']:
- # BUG IN OAR REST API : job with reservation didn't return
- # resources attribute list. We use another request for
- # finding job resources
- exp_nodes = self.api.method('admin/experiments/%d' % exp['id'])
- exp['resources'] = exp_nodes['nodes']
# BUG ASAP jobs without date information
if exp['date'] == "as soon as possible":
exp['date'] = 0
"""
# pylint:disable=E1123
logger.warning("iotlashell add_user")
+ logger.warning("slice_user: %s" % slice_user)
+ if 'urn' in slice_user:
+ organization = slice_user['urn']
+ else:
+ organization = "SFA federation"
# single account creation
user = {"type": "SA",
"city": "To be defined",
"country": "To be defined",
- "motivations": "SFA federation"}
+ "motivations": "SFA federation",
+ "organization": organization}
email = slice_user['email']
user['email'] = email
user['sshPublicKey'] = slice_user['keys'][0]
# ex : onelab.inria
- user['structure'] = slice_user['slice_record']['authority']
+ user['structure'] = slice_user['urn'].split('+')[1].replace(':','.')
email = (email.split('@'))[0]
user['firstName'] = email.split('.')[0]
try: