-# import modules used here -- sys is a very standard one
import sys
import httplib
import json
import datetime
from time import gmtime, strftime
from sfa.senslab.parsing import *
-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'
+from sfa.util.config import Config
+
+
OARIP='192.168.0.109'
'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_resources_id': '/oarapi/resources/id.json',
'GET_jobs_table': '/oarapi/jobs/table.json',
'GET_jobs_details': '/oarapi/jobs/details.json',
+ 'GET_reserved_nodes': '/oarapi/jobs/details.json?state=Runnng,Waiting,Launching',
'GET_resources_full': '/oarapi/resources/full.json',
'GET_resources':'/oarapi/resources.json',
+ 'GET_sites' : '/oarapi/resources/full.json',
+
}
-OARrequest_post_uri_dict = { 'POST_job': '/oarapi/jobs.json'}
+OARrequest_post_uri_dict = {
+ 'POST_job':{'uri': '/oarapi/jobs.json'},
+ 'DELETE_jobs_id':{'uri':'/oarapi/jobs/id.json'},}
POSTformat = { #'yaml': {'content':"text/yaml", 'object':yaml}
'json' : {'content':"application/json",'object':json},
self.parser = OARGETParser(self)
- def GETRequestToOARRestAPI(self, request, strval=None ):
+ def GETRequestToOARRestAPI(self, request, strval=None , username = None ):
self.oarserver['uri'] = OARrequests_get_uri_dict[request]
- #if request is "GET_jobs_details":
- #data = json.dumps([])
- #else:
+ headers = {}
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']
-
+ if username:
+ headers['X-REMOTE_IDENT'] = username
try :
- headers = {'X-REMOTE_IDENT':'savakian',\
- 'content-length':'0'}
+ #headers = {'X-REMOTE_IDENT':'avakian',\
+ #'content-length':'0'}
+ headers['content-length'] = '0' #seems that it does not work if we don't add this
+
#conn = httplib.HTTPConnection(self.oarserver['ip'],self.oarserver['port'])
#conn.putheader(headers)
#conn.endheaders()
except ValueError:
raise ServerError("Failed to parse Server Response:" + js)
-
def POSTRequestToOARRestAPI(self, request, datadict, username=None):
#first check that all params for are OK
-
+
print>>sys.stderr, " \r\n \r\n POSTRequestToOARRestAPI username",username
try:
- self.oarserver['uri'] = OARrequest_post_uri_dict[request]
+ self.oarserver['uri'] = OARrequest_post_uri_dict[request]['uri']
+
except:
print>>sys.stderr, " \r\n \r\n POSTRequestToOARRestAPI request not in OARrequest_post_uri_dict"
return
+ try:
+ if datadict and 'strval' in datadict:
+ self.oarserver['uri'] = self.oarserver['uri'].replace("id",str(datadict['strval']))
+ del datadict['strval']
+ except:
+ print>>sys.stderr, " \r\n \r\n POSTRequestToOARRestAPI ERRRRRORRRRRR "
+ return
#if format in POSTformat:
#if format is 'json':
data = json.dumps(datadict)
try :
#self.oarserver['postformat'] = POSTformat[format]
- print>>sys.stderr, "\r\n POSTRequestToOARRestAPI headers %s uri %s" %(headers,self.oarserver['uri'])
conn = httplib.HTTPConnection(self.oarserver['ip'],self.oarserver['port'])
conn.request("POST",self.oarserver['uri'],data,headers )
resp = ( conn.getresponse()).read()
def AddNodeSite(self,tuplelist,value):
- tuplelist.append(('site_login_base',str(value)))
+ tuplelist.append(('site',str(value)))
+
def AddNodeRadio(self,tuplelist,value):
tuplelist.append(('radio',str(value)))
def ParseTimezone(self) :
api_timestamp=self.raw_json['api_timestamp']
+ api_tz=self.raw_json['timezone']
#readable_time = strftime("%Y-%m-%d %H:%M:%S", gmtime(float(api_timestamp)))
- return api_timestamp
+ return api_timestamp,api_tz
def ParseJobs(self) :
self.jobs_list = []
def ParseJobsTable(self) :
print "ParseJobsTable"
- def ParseJobsDetails (self):
-
+ def ParseJobsDetails (self):
+ # currently, this function is not used a lot, so i have no idea what be usefull to parse, returning the full json. NT
print >>sys.stderr,"ParseJobsDetails %s " %(self.raw_json)
+ return self.raw_json
def ParseJobsIds(self):
self.ParseNodes()
-
+ def ParseDeleteJobs(self):
+ return
def ParseResourcesFull(self ) :
print>>sys.stderr, " \r\n \t\t\t ParseResourcesFull_____________________________ "
self.ParseNodes()
self.ParseSites()
return self.node_dictlist
+
+ def ParseResourcesFullSites(self ) :
+ if self.version_json_dict['apilib_version'] != "0.2.10" :
+ self.raw_json = self.raw_json['items']
+ self.ParseNodes()
+ self.ParseSites()
+ return self.site_dict
+
resources_fulljson_dict= {
'resource_id' : AddNodeId,
#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'])
+ if node['site'] not in nodes_per_site:
+ nodes_per_site[node['site']] = []
+ nodes_per_site[node['site']].append(node['node_id'])
else:
- if node['node_id'] not in nodes_per_site[node['site_login_base']]:
- nodes_per_site[node['site_login_base']].append(node['node_id'])
+ if node['node_id'] not in nodes_per_site[node['site']]:
+ nodes_per_site[node['site']].append(node['node_id'])
+
#Create a site dictionary with key is site_login_base (name of the site)
# 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.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:
- 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']]),\
- ('latitude',"48.83726"),\
- ('longitude',"- 2.10336"),('name',"senslab"),\
- ('pcu_ids', []), ('max_slices', None), ('ext_consortium_id', None),\
- ('max_slivers', None), ('is_public', True), ('peer_site_id', None),\
- ('abbreviated_name', "senslab"), ('address_ids', []),\
- ('url', "http,//www.senslab.info"), ('person_ids', []),\
- ('site_tag_ids', []), ('enabled', True), ('slice_ids', []),\
- ('date_created', None), ('peer_id', None),]
- self.site_dict[node['site_login_base']] = dict(self.site_dict[node['site_login_base']])
+ #if node_id is 1:
+ if node['site'] not in self.site_dict:
+ self.site_dict[node['site']] = {'site':node['site'],
+ 'node_ids':nodes_per_site[node['site']],
+ 'latitude':"48.83726",
+ 'longitude':"- 2.10336",'name':config.SFA_REGISTRY_ROOT_AUTH,
+ 'pcu_ids':[], 'max_slices':None, 'ext_consortium_id':None,
+ 'max_slivers':None, 'is_public':True, 'peer_site_id': None,
+ 'abbreviated_name':"senslab", 'address_ids': [],
+ 'url':"http,//www.senslab.info", 'person_ids':[],
+ 'site_tag_ids':[], 'enabled': True, 'slice_ids':[],
+ 'date_created': None, 'peer_id': None }
+ #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']],
+ #'latitude':"48.83726",
+ #'longitude':"- 2.10336",'name':"senslab",
+ #'pcu_ids':[], 'max_slices':None, 'ext_consortium_id':None,
+ #'max_slivers':None, 'is_public':True, 'peer_site_id': None,
+ #'abbreviated_name':"senslab", 'address_ids': [],
+ #'url':"http,//www.senslab.info", 'person_ids':[],
+ #'site_tag_ids':[], 'enabled': True, 'slice_ids':[],
+ #'date_created': None, 'peer_id': None }
+
'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_sites':{'uri':'/oarapi/resources/full.json','parse_func': ParseResourcesFullSites},
'GET_resources':{'uri':'/oarapi/resources.json' ,'parse_func': ParseResources},
+ 'DELETE_jobs_id':{'uri':'/oarapi/jobs/id.json' ,'parse_func': ParseDeleteJobs}
}
self.site_dict = {}
self.SendRequest("GET_version")
- def SendRequest(self,request, strval = None ):
+ def SendRequest(self,request, strval = None , username = None):
if request in OARrequests_get_uri_dict:
- self.raw_json = self.server.GETRequestToOARRestAPI(request,strval)
- #print>>sys.stderr, "\r\n OARGetParse __init__ : request %s result %s "%(request,self.raw_json)
+ self.raw_json = self.server.GETRequestToOARRestAPI(request,strval,username)
return self.OARrequests_uri_dict[request]['parse_func'](self)
else:
print>>sys.stderr, "\r\n OARGetParse __init__ : ERROR_REQUEST " ,request
-
\ No newline at end of file
+
git://git.onelab.eu / sfa.git / blobdiff