git://git.onelab.eu
/
monitor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove unnecessary informatiton on pcuview page
[monitor.git]
/
monitor
/
wrapper
/
plc.py
diff --git
a/monitor/wrapper/plc.py
b/monitor/wrapper/plc.py
index
2f0f19d
..
b681d55
100644
(file)
--- a/
monitor/wrapper/plc.py
+++ b/
monitor/wrapper/plc.py
@@
-84,7
+84,6
@@
class PLC:
def __repr__(self):
return self.api.__repr__()
def __repr__(self):
return self.api.__repr__()
-api = PLC(auth.auth, auth.server)
class CachedPLC(PLC):
class CachedPLC(PLC):
@@
-132,6
+131,9
@@
class CachedPLC(PLC):
return run_or_returncached
return run_or_returncached
+api = PLC(auth.auth, auth.server)
+cacheapi = CachedPLC(auth.auth, auth.server)
+
def getAPI(url):
return xmlrpclib.Server(url, verbose=False, allow_none=True)
def getAPI(url):
return xmlrpclib.Server(url, verbose=False, allow_none=True)
@@
-146,6
+148,13
@@
def getAuthAPI():
def getCachedAuthAPI():
return CachedPLC(auth.auth, auth.server)
def getCachedAuthAPI():
return CachedPLC(auth.auth, auth.server)
+def getSessionAPI(session, server):
+ nodeauth = Auth(session=session)
+ return PLC(nodeauth.auth, server)
+def getUserAPI(username, password, server):
+ auth = Auth(username,password)
+ return PLC(auth.auth, server)
+
def getTechEmails(loginbase):
"""
For the given site, return all user email addresses that have the 'tech' role.
def getTechEmails(loginbase):
"""
For the given site, return all user email addresses that have the 'tech' role.
@@
-301,14
+310,14
@@
def getSiteNodes2(loginbase):
def getNodeNetworks(filter=None):
api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True)
def getNodeNetworks(filter=None):
api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True)
- nodenetworks = api.Get
NodeNetwork
s(auth.auth, filter, None)
+ nodenetworks = api.Get
Interface
s(auth.auth, filter, None)
return nodenetworks
def getNodes(filter=None, fields=None):
api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True)
nodes = api.GetNodes(auth.auth, filter, fields)
#['boot_state', 'hostname',
return nodenetworks
def getNodes(filter=None, fields=None):
api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True)
nodes = api.GetNodes(auth.auth, filter, fields)
#['boot_state', 'hostname',
- #'site_id', 'date_created', 'node_id', 'version', '
nodenetwork
_ids',
+ #'site_id', 'date_created', 'node_id', 'version', '
interface
_ids',
#'last_updated', 'peer_node_id', 'ssh_rsa_key' ])
return nodes
#'last_updated', 'peer_node_id', 'ssh_rsa_key' ])
return nodes