from sfa.senslab.SenslabImportUsers import *
import urllib
import urllib2
-
-
+from sfa.util.config import Config
+from sfa.util.plxrn import PlXrn
+from sfa.util.xrn import hrn_to_urn, get_authority,Xrn,get_leaf
#OARIP='10.127.255.254'
OARIP='192.168.0.109'
OARrequests_get_uri_dict = { 'GET_version': '/oarapi/version.json',
'GET_timezone':'/oarapi/timezone.json' ,
'GET_jobs': '/oarapi/jobs.json',
- 'GET_jobs<id>': '/oarapi/jobs/id.json',
- 'GET_jobs<id>/resources': '/oarapi/jobs/id/resources.json',
- 'GET_resources/<id>': '/oarapi/resources/.json',
+ 'GET_jobs_id': '/oarapi/jobs/id.json',
+ 'GET_jobs_id_resources': '/oarapi/jobs/id/resources.json',
+ 'GET_resources_id': '/oarapi/resources/.json',
'GET_jobs_table': '/oarapi/jobs/table.json',
'GET_jobs_details': '/oarapi/jobs/details.json',
'GET_resources_full': '/oarapi/resources/full.json',
'GET_resources':'/oarapi/resources.json',
+
}
OARrequest_post_uri_dict = { 'POST_job': '/oarapi/jobs.json'}
self.oarserver['ip'] = OARIP
self.oarserver['port'] = 80
self.oarserver['uri'] = None
- self.oarserver['postformat'] = 'json'
+ self.oarserver['postformat'] = 'json'
+ self.parser = OARGETParser(self)
+
def GETRequestToOARRestAPI(self, request, strval=None ):
- self.oarserver['uri'] = OARrequests_get_uri_dict[request]
- if strval:
- self.oarserver['uri'] = self.oarserver['uri'].replace("id",strval)
+ self.oarserver['uri'] = OARrequests_get_uri_dict[request]
+ data = json.dumps({})
+ if strval:
+ self.oarserver['uri'] = self.oarserver['uri'].replace("id",str(strval))
print>>sys.stderr, "\r\n \r\n GETRequestToOARRestAPI replace : self.oarserver['uri'] %s", self.oarserver['uri']
- try :
+ try :
+ headers = {'X-REMOTE_IDENT':'savakian',\
+ 'content-length':'0'}
+ #conn = httplib.HTTPConnection(self.oarserver['ip'],self.oarserver['port'])
+ #conn.putheader(headers)
+ #conn.endheaders()
+ #conn.putrequest("GET",self.oarserver['uri'] )
conn = httplib.HTTPConnection(self.oarserver['ip'],self.oarserver['port'])
- conn.request("GET",self.oarserver['uri'] )
+
+ conn.request("GET",self.oarserver['uri'],data , headers )
resp = ( conn.getresponse()).read()
conn.close()
except:
raise ServerError("GET_OAR_SRVR : Could not reach OARserver")
try:
js = json.loads(resp)
+ if strval:
+ print>>sys.stderr, " \r\n \r\n \t GETRequestToOARRestAPI strval %s js %s" %(strval,js)
return js
except ValueError:
def ParseJobsDetails (self):
print "ParseJobsDetails"
+
+
+ def ParseJobsIds(self):
+
+ job_resources =['assigned_network_address', 'assigned_resources','Job_Id', 'scheduledStart','state','job_user', 'startTime','walltime','message']
+ job_resources_full = ['Job_Id', 'scheduledStart', 'resubmit_job_id', 'owner', 'submissionTime', 'message', 'id', 'jobType', 'queue', 'launchingDirectory', 'exit_code', 'state', 'array_index', 'events', 'assigned_network_address', 'cpuset_name', 'initial_request', 'job_user', 'assigned_resources', 'array_id', 'job_id', 'resources_uri', 'dependencies', 'api_timestamp', 'startTime', 'reservation', 'properties', 'types', 'walltime', 'name', 'uri', 'wanted_resources', 'project', 'command']
+
+ job_info = self.raw_json
+
+ values=[]
+ try:
+ for k in job_resources:
+ values.append(job_info[k])
+ return dict(zip(job_resources,values))
+
+ except KeyError:
+ print>>sys.stderr, " \r\n \t ParseJobsIds Key Error"
+
+
+
+
+ def ParseJobsIdResources(self):
+ print>>sys.stderr, "ParseJobsIdResources"
def ParseResources(self) :
print>>sys.stderr, " \r\n \t\t\t ParseResources__________________________ "
self.raw_json = self.raw_json['items']
self.ParseNodes()
self.ParseSites()
+ return self.node_dictlist
-
+ resources_fulljson_dict= {
+ 'resource_id' : AddNodeId,
+ 'network_address' : AddNodeNetworkAddr,
+ 'site': AddNodeSite,
+ 'radio': AddNodeRadio,
+ 'mobile': AddMobility,
+ 'posx': AddPosX,
+ 'posy': AddPosY,
+ 'state':AddBootState,
+ }
+
#Parse nodes properties from OAR
#Put them into a dictionary with key = node id and value is a dictionary
#print >>sys.stderr, " \r\n \r\n \t\t OARrestapi.py ParseNodes self.raw_json %s" %(self.raw_json)
for dictline in self.raw_json:
#print >>sys.stderr, " \r\n \r\n \t\t OARrestapi.py ParseNodes dictline %s hey" %(dictline)
- for k in dictline.keys():
+ for k in dictline:
if k in self.resources_fulljson_dict:
# dictionary is empty and/or a new node has to be inserted
if node_id is None :
node_id = self.resources_fulljson_dict[k](self,self.node_dictlist, dictline[k])
else:
ret = self.resources_fulljson_dict[k](self,self.node_dictlist[node_id], dictline[k])
+
#If last property has been inserted in the property tuple list, reset node_id
if ret == 0:
#Turn the property tuple list (=dict value) into a dictionary
else:
pass
-
+
+ def hostname_to_hrn(self, root_auth, login_base, hostname):
+ return PlXrn(auth=root_auth,hostname=login_base+'_'+hostname).get_hrn()
#Retourne liste de dictionnaires contenant attributs des sites
def ParseSites(self):
nodes_per_site = {}
# Create a list of nodes per site_id
for node_id in self.node_dictlist.keys():
node = self.node_dictlist[node_id]
+
if node['site_login_base'] not in nodes_per_site.keys():
nodes_per_site[node['site_login_base']] = []
nodes_per_site[node['site_login_base']].append(node['node_id'])
# and value is a dictionary of properties, including the list of the node_ids
for node_id in self.node_dictlist.keys():
node = self.node_dictlist[node_id]
+ node.update({'hrn':self.hostname_to_hrn(self.interface_hrn, node['site_login_base'],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:
+ print>>sys.stderr, " \r\n \r\n \t \t\t\t OARESTAPI Parse Sites self.node_dictlist %s " %(self.node_dictlist)
if node['site_login_base'] not in self.site_dict.keys():
self.site_dict[node['site_login_base']] = [('login_base', node['site_login_base']),\
('node_ids',nodes_per_site[node['site_login_base']]),\
('date_created', None), ('peer_id', None),]
self.site_dict[node['site_login_base']] = dict(self.site_dict[node['site_login_base']])
- #print>>sys.stderr, "\r\n \r\n =============\t\t ParseSites site dict %s \r\n"%(self.site_dict)
-
-
- def GetNodesFromOARParse(self):
- #print>>sys.stderr, " \r\n =========GetNodesFromOARParse: node_dictlist %s "%(self.node_dictlist)
- return self.node_dictlist
- def GetSitesFromOARParse(self):
- return self.site_dict
-
- def GetJobsFromOARParse(self):
- return self.jobs_list
OARrequests_uri_dict = {
'GET_version': {'uri':'/oarapi/version.json', 'parse_func': ParseVersion},
'GET_timezone':{'uri':'/oarapi/timezone.json' ,'parse_func': ParseTimezone },
'GET_jobs': {'uri':'/oarapi/jobs.json','parse_func': ParseJobs},
+ 'GET_jobs_id': {'uri':'/oarapi/jobs/id.json','parse_func': ParseJobsIds},
+ 'GET_jobs_id_resources': {'uri':'/oarapi/jobs/id/resources.json','parse_func': ParseJobsIdResources},
'GET_jobs_table': {'uri':'/oarapi/jobs/table.json','parse_func': ParseJobsTable},
'GET_jobs_details': {'uri':'/oarapi/jobs/details.json','parse_func': ParseJobsDetails},
'GET_resources_full': {'uri':'/oarapi/resources/full.json','parse_func': ParseResourcesFull},
'GET_resources':{'uri':'/oarapi/resources.json' ,'parse_func': ParseResources},
}
- resources_fulljson_dict= {
- 'resource_id' : AddNodeId,
- 'network_address' : AddNodeNetworkAddr,
- 'site': AddNodeSite,
- 'radio': AddNodeRadio,
- 'mobile': AddMobility,
- 'posx': AddPosX,
- 'posy': AddPosY,
- 'state':AddBootState,
- }
def __init__(self, srv ):
self.version_json_dict= { 'api_version' : None , 'apilib_version' :None, 'api_timezone': None, 'api_timestamp': None, 'oar_version': None ,}
+ self.config = Config()
+ self.interface_hrn = self.config.SFA_INTERFACE_HRN
self.timezone_json_dict = { 'timezone': None, 'api_timestamp': None, }
self.jobs_json_dict = { 'total' : None, 'links' : [] , 'offset':None , 'items' : [] , }
self.jobs_table_json_dict = self.jobs_json_dict
self.jobs_details_json_dict = self.jobs_json_dict
self.server = srv
self.node_dictlist = {}
+
self.site_dict = {}
self.SendRequest("GET_version")
- def SendRequest(self,request):
+ def SendRequest(self,request, strval = None ):
if request in OARrequests_get_uri_dict:
- self.raw_json = self.server.GETRequestToOARRestAPI(request)
- self.OARrequests_uri_dict[request]['parse_func'](self)
+ self.raw_json = self.server.GETRequestToOARRestAPI(request,strval)
+ #print>>sys.stderr, "\r\n OARGetParse __init__ : request %s result %s "%(request,self.raw_json)
+ return self.OARrequests_uri_dict[request]['parse_func'](self)
else:
print>>sys.stderr, "\r\n OARGetParse __init__ : ERROR_REQUEST " ,request
-class OARapi:
- def __init__(self):
- self.server = OARrestapi()
- self.parser = OARGETParser(self.server)
-
- #GetNodes moved to slabdriver.py
-
-
-
-
- def GetJobs(self):
- print>>sys.stderr, " \r\n GetJobs"
- self.parser.SendRequest("GET_jobs")
- return self.parser.GetJobsFromOARParse()
-
git://git.onelab.eu / sfa.git / blobdiff