git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6f8fbdd
)
just import the nm api source instead of using its xmlrpc interface
author
Tony Mack
<tmack@cs.princeton.edu>
Mon, 30 Nov 2009 19:48:30 +0000
(19:48 +0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Mon, 30 Nov 2009 19:48:30 +0000
(19:48 +0000)
sfa/plc/api.py
patch
|
blob
|
history
diff --git
a/sfa/plc/api.py
b/sfa/plc/api.py
index
636a000
..
ed8883f
100644
(file)
--- a/
sfa/plc/api.py
+++ b/
sfa/plc/api.py
@@
-430,14
+430,11
@@
class ComponentAPI(BaseAPI):
self.nodemanager = self.getNodeManagerShell()
def getNodeManagerShell(self):
- # do we need an auth ?
- auth = {}
- try:
- nodemanager = xmlrpclib.ServerProxy('http://127.0.0.1:812')
- except:
- raise
+ # just import the nm api source
+ sys.path.append('/usr/share/NodeManager')
+ import api_calls
+ return api_calls
- return nodemanager
def sliver_exists(self):
sliver_dict = self.nodemanager.GetXIDs()