From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Tue, 26 Jun 2012 09:05:36 +0000 (+0200)
Subject: Fixed small merge problems.
X-Git-Tag: sfa-2.1-24~3^2~149
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=52234af8017391f031ef4a92f6df43e140765fcf;p=sfa.git
Fixed small merge problems.
---
diff --git a/sfa/senslab/OARrestapi.py b/sfa/senslab/OARrestapi.py
index d5e3570c..2649abd7 100644
--- a/sfa/senslab/OARrestapi.py
+++ b/sfa/senslab/OARrestapi.py
@@ -17,20 +17,7 @@ from sfa.util.sfalogging import logger
OARIP ='194.199.16.161'
-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/id.json',
- 'GET_jobs_table': '/oarapi/jobs/table.json',
- 'GET_jobs_details': '/oarapi/jobs/details.json',
- 'GET_reserved_nodes': '/oarapi/jobs/details.json?state=Running,Waiting,Launching',
- 'GET_running_jobs': '/oarapi/jobs/details.json?state=Running',
- 'GET_resources_full': '/oarapi/resources/full.json',
- 'GET_resources':'/oarapi/resources.json',
- 'GET_sites' : '/oarapi/resources/full.json',
- }
+
@@ -288,7 +275,12 @@ class OARGETParser:
def ParseRunningJobs(self):
print>>sys.stderr, " \r\n \t\t\t ParseRunningJobs__________________________ "
#resources are listed inside the 'items' list from the json
- return self.raw_json
+ nodes = []
+ for job in self.raw_json['items']:
+ for node in job['nodes']:
+ nodes.append(node['network_address'])
+ return nodes
+
def ParseDeleteJobs(self):
diff --git a/sfa/senslab/slabdriver.py b/sfa/senslab/slabdriver.py
index 562f5d5b..e3201136 100644
--- a/sfa/senslab/slabdriver.py
+++ b/sfa/senslab/slabdriver.py
@@ -547,19 +547,7 @@ class SlabDriver(Driver):
def GetReservedNodes(self):
# this function returns a list of all the nodes already involved in an oar job
-
-
-
-
-
-
-
-
-
-
-
-
- return self.oar.parser.SendRequest("GET_reserved_nodes")
+ return self.oar.parser.SendRequest("GET_running_jobs")
def GetNodes(self,node_filter_dict = None, return_fields_list = None):