#import sys
-import httplib
+from httplib import HTTPConnection, HTTPException
import json
#import datetime
#from time import gmtime, strftime
#seems that it does not work if we don't add this
headers['content-length'] = '0'
- conn = httplib.HTTPConnection(self.oarserver['ip'], \
+ conn = HTTPConnection(self.oarserver['ip'], \
self.oarserver['port'])
conn.request("GET", self.oarserver['uri'], data, headers)
resp = ( conn.getresponse()).read()
conn.close()
- except NotConnected:
- logger.log_exc("GET_OAR_SRVR : Could not reach OARserver")
+ except HTTPException, error :
+ logger.log_exc("GET_OAR_SRVR : Problem with OAR server : %s " \
+ %(error))
#raise ServerError("GET_OAR_SRVR : Could not reach OARserver")
try:
js_dict = json.loads(resp)
logger.log_exc("OARrestapi \tPOSTRequestToOARRestAPI request not \
valid")
return
- #try:
if datadict and 'strval' in datadict:
self.oarserver['uri'] = self.oarserver['uri'].replace("id", \
str(datadict['strval']))
del datadict['strval']
- #except:
- #logger.log_exc("OARrestapi.py POSTRequestToOARRestAPI Error")
- return
data = json.dumps(datadict)
headers = {'X-REMOTE_IDENT':username, \
'content-length':str(len(data))}
try :
- conn = httplib.HTTPConnection(self.oarserver['ip'], \
+ conn = HTTPConnection(self.oarserver['ip'], \
self.oarserver['port'])
conn.request("POST", self.oarserver['uri'], data, headers)
resp = (conn.getresponse()).read()
#raise ServerError("Failed to parse Server Response:" + answer)
-#def AddNodeNetworkAddr(self,tuplelist,value):
- #tuplelist.append(('hostname',str(value)))
-
+
+def AddOarNodeId(tuplelist, value):
+ """ Adds Oar internal node id to the nodes attributes """
+
+ tuplelist.append(('oar_id', int(value)))
+
+
def AddNodeNetworkAddr(dictnode, value):
#Inserts new key. The value associated is a tuple list
node_id = value
def AddMobility(tuplelist, value):
- if value :
- tuplelist.append(('mobile', int(value)))
+ if value is 0:
+ tuplelist.append(('mobile', 'False'))
+ else :
+ tuplelist.append(('mobile', 'True'))
def AddPosX(tuplelist, value):
tuplelist.append(('posx', value))
-
def AddPosY(tuplelist, value):
tuplelist.append(('posy', value))
-
+
+def AddPosZ(tuplelist, value):
+ tuplelist.append(('posz', value))
+
def AddBootState(tuplelist, value):
tuplelist.append(('boot_state', str(value)))
dictnode[node_id] = [('node_id', node_id)]
return node_id
-
+def AddHardwareType(tuplelist, value):
+ value_list = value.split(':')
+ tuplelist.append(('archi', value_list[0]))
+ tuplelist.append(('radio', value_list[1]))
+
class OARGETParser:
-
-
resources_fulljson_dict = {
'network_address' : AddNodeNetworkAddr,
'site': AddNodeSite,
'radio': AddNodeRadio,
'mobile': AddMobility,
- 'posx': AddPosX,
- 'posy': AddPosY,
+ 'x': AddPosX,
+ 'y': AddPosY,
+ 'z':AddPosZ,
+ 'archi':AddHardwareType,
'state':AddBootState,
- #'id' : AddNodeId,
+ 'id' : AddOarNodeId,
}
self.SendRequest("GET_version")
- #def AddNodeNetworkAddr(self,tuplelist,value):
- #tuplelist.append(('hostname',str(value)))
-
- #def AddNodeNetworkAddr(self,dictnode,value):
- ##Inserts new key. The value associated is a tuple list
- #node_id = value
-
- #dictnode[node_id] = [('node_id',node_id),('hostname',node_id) ]
-
- #return node_id
-
- #def AddNodeSite(self,tuplelist,value):
- #tuplelist.append(('site',str(value)))
-
-
- #def AddNodeRadio(self,tuplelist,value):
- #tuplelist.append(('radio',str(value)))
-
-
- #def AddMobility(self,tuplelist,value):
- #if value :
- #tuplelist.append(('mobile',int(value)))
-
-
- #def AddPosX(self,tuplelist,value):
- #tuplelist.append(('posx',value))
-
-
- #def AddPosY(self,tuplelist,value):
- #tuplelist.append(('posy',value))
-
- #def AddBootState(self,tuplelist,value):
- #tuplelist.append(('boot_state',str(value)))
-
- ##Insert a new node into the dictnode dictionary
- #def AddNodeId(self,dictnode,value):
- ##Inserts new key. The value associated is a tuple list
- #node_id = int(value)
-
- #dictnode[node_id] = [('node_id',node_id) ]
- #return node_id
+
def ParseVersion(self) :
#print self.raw_json
# currently, this function is not used a lot,
#so i have no idea what be usefull to parse,
#returning the full json. NT
- logger.debug("ParseJobsDetails %s " %(self.raw_json))
+ #logger.debug("ParseJobsDetails %s " %(self.raw_json))
return self.raw_json
job_info = self.raw_json
- logger.debug("OARESTAPI ParseJobsIds %s" %(self.raw_json))
+ #logger.debug("OARESTAPI ParseJobsIds %s" %(self.raw_json))
values = []
try:
for k in job_resources:
def ParseJobsIdResources(self):
- """ BROKEN since oar 2.5
- Parses the json produced by the request /oarapi/jobs/id.json.
+ """ Parses the json produced by the request
+ /oarapi/jobs/id/resources.json.
+ Returns a list of oar node ids that are scheduled for the
+ given job id.
"""
- logger.debug("OARESTAPI \tParseJobsIdResources %s" %(self.raw_json))
- return self.raw_json
+ job_resources = []
+ for resource in self.raw_json['items']:
+ job_resources.append(resource['id'])
+
+ #logger.debug("OARESTAPI \tParseJobsIdResources %s" %(self.raw_json))
+ return job_resources
def ParseResources(self) :
""" Parses the json produced by a get_resources request on oar."""
- logger.debug("OARESTAPI \tParseResources " )
+ #logger.debug("OARESTAPI \tParseResources " )
#resources are listed inside the 'items' list from the json
self.raw_json = self.raw_json['items']
self.ParseNodes()
""" Returns an array containing the list of the reserved nodes """
#resources are listed inside the 'items' list from the json
- nodes = []
+ reservation_list = []
print "ParseReservedNodes_%s" %(self.raw_json['items'])
- for job in self.raw_json['items']:
- for node in job['nodes']:
- print "ParseReservedNodes________node %s" %(node)
- logger.debug("ParseReservedNodes________node %s" %(node))
- nodes.append(node['network_address'])
- return nodes
+ job = {}
+ #Parse resources info
+ for json_element in self.raw_json['items']:
+ job['t_from'] = json_element['scheduled_start']
+ #Get resources id list for the job
+ job['resource_ids'] = \
+ [ node_dict['id'] for node_dict in json_element['resources'] ]
+
+ job['state'] = json_element['state']
+ job['lease_id'] = json_element['id']
+ job['t_until'] = json_element['scheduled_start'] + \
+ json_element['walltime']
+ job['user'] = json_element['owner']
+ #logger.debug("OARRestapi \tParseReservedNodes job %s" %(job))
+ reservation_list.append(job)
+ #reset dict
+ job = {}
+ return reservation_list
def ParseRunningJobs(self):
""" Gets the list of nodes currently in use from the attributes of the
# dictionary is empty and/or a new node has to be inserted
node_id = self.resources_fulljson_dict['network_address'](\
self.node_dictlist, dictline['network_address'])
- #node_id = self.resources_fulljson_dict['network_address'](self,self.node_dictlist, dictline['network_address'])
for k in keys:
if k in dictline:
if k == 'network_address':
self.resources_fulljson_dict[k](\
self.node_dictlist[node_id], dictline[k])
- #self.resources_fulljson_dict[k](self,self.node_dictlist[node_id], dictline[k])
-
+
#The last property has been inserted in the property tuple list,
#reset node_id
#Turn the property tuple list (=dict value) into a dictionary
nodes_per_site = {}
config = Config()
- logger.debug(" OARrestapi.py \tParseSites self.node_dictlist %s"\
- %(self.node_dictlist))
+ #logger.debug(" OARrestapi.py \tParseSites self.node_dictlist %s"\
+ #%(self.node_dictlist))
# Create a list of nodes per site_id
for node_id in self.node_dictlist.keys():
node = self.node_dictlist[node_id]
node = self.node_dictlist[node_id]
node.update({'hrn':self.hostname_to_hrn(self.interface_hrn, \
node['site'],node['hostname'])})
- #node['hrn'] = self.hostname_to_hrn(self.interface_hrn, node['site_login_base'],node['hostname'])
+
self.node_dictlist.update({node_id:node})
- #if node_id is 1:
+
if node['site'] not in self.site_dict:
self.site_dict[node['site']] = {
'site':node['site'],
git://git.onelab.eu / sfa.git / blobdiff