git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed parsing.py and parse_filter function in GetNodes and GetSites.
[sfa.git]
/
sfa
/
senslab
/
OARrestapi.py
diff --git
a/sfa/senslab/OARrestapi.py
b/sfa/senslab/OARrestapi.py
index
531a2aa
..
8f5aa62
100644
(file)
--- a/
sfa/senslab/OARrestapi.py
+++ b/
sfa/senslab/OARrestapi.py
@@
-1,4
+1,3
@@
-# import modules used here -- sys is a very standard one
import sys
import httplib
import json
import sys
import httplib
import json
@@
-13,7
+12,7
@@
from sfa.util.xrn import hrn_to_urn, get_authority,Xrn,get_leaf
from sfa.util.config import Config
from sfa.util.config import Config
-#OARIP='10.127.255.254'
+
OARIP='192.168.0.109'
OARIP='192.168.0.109'
@@
-330,7
+329,7
@@
class OARGETParser:
#Retourne liste de dictionnaires contenant attributs des sites
def ParseSites(self):
nodes_per_site = {}
#Retourne liste de dictionnaires contenant attributs des sites
def ParseSites(self):
nodes_per_site = {}
- config = Config()
+
# Create a list of nodes per site_id
for node_id in self.node_dictlist.keys():
node = self.node_dictlist[node_id]
# Create a list of nodes per site_id
for node_id in self.node_dictlist.keys():
node = self.node_dictlist[node_id]