Modified ip address (prod migration).

[sfa.git] / sfa / senslab / OARrestapi.py

diff --git a/sfa/senslab/OARrestapi.py b/sfa/senslab/OARrestapi.py
index d2c8f98..ee7f8b4 100644 (file)
--- a/sfa/senslab/OARrestapi.py
+++ b/sfa/senslab/OARrestapi.py
@@ -12,7 +12,7 @@ from sfa.util.config import Config
 from sfa.util.sfalogging import logger
 
 
-OARIP = '194.199.16.161'
+OARIP = '194.199.16.166'
 
 OAR_REQUEST_POST_URI_DICT = {'POST_job':{'uri': '/oarapi/jobs.json'},
                             'DELETE_jobs_id':{'uri':'/oarapi/jobs/id.json'},
@@ -47,6 +47,9 @@ class OARrestapi:
     def GETRequestToOARRestAPI(self, request, strval=None , username = None ): 
         self.oarserver['uri'] = \
                             OARGETParser.OARrequests_uri_dict[request]['uri']
+        #Get job details with username                   
+        if 'owner' in OARGETParser.OARrequests_uri_dict[request] and username:
+           self.oarserver['uri'] +=  OARGETParser.OARrequests_uri_dict[request]['owner'] + username
         headers = {}
         data = json.dumps({})
         logger.debug("OARrestapi \tGETRequestToOARRestAPI %s" %(request))
@@ -507,7 +510,10 @@ class OARGETParser:
         'GET_reserved_nodes':
                 {'uri':
                 '/oarapi/jobs/details.json?state=Running,Waiting,Launching',\
+                'owner':'&user=',
                 'parse_func':ParseReservedNodes},
+
+                
         'GET_running_jobs':  
                 {'uri':'/oarapi/jobs/details.json?state=Running',\
                 'parse_func':ParseRunningJobs},