git://git.onelab.eu
/
tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
task-ified version of slice-fs-{present,deleted}
[tests.git]
/
system
/
TestApiserver.py
diff --git
a/system/TestApiserver.py
b/system/TestApiserver.py
index
d4eb2c1
..
ea85300
100644
(file)
--- a/
system/TestApiserver.py
+++ b/
system/TestApiserver.py
@@
-1,17
+1,23
@@
-# $Id$
+# Thierry Parmentelat <thierry.parmentelat@inria.fr>
+# Copyright (C) 2010 INRIA
+#
# wrapper to xmlrpc server, that support dry-run commands
# we dont want to have to depend on PLCAPI, so:
import xmlrpclib
# wrapper to xmlrpc server, that support dry-run commands
# we dont want to have to depend on PLCAPI, so:
import xmlrpclib
+# the default value is for the dry run mode
server_methods = [ ('GetNodes' , []),
('AddNode' , True),
server_methods = [ ('GetNodes' , []),
('AddNode' , True),
+ ('SetNodePlainBootstrapfs', True),
('DeleteNode' , True),
('UpdateNode' , True),
('AddInterface' , True),
('DeleteNode' , True),
('UpdateNode' , True),
('AddInterface' , True),
+ ('AddIpAddress' , True),
+ ('AddRoute' , True),
('GetInterfaces' , True),
('GetTagTypes' , []),
('AddTagType' , True),
('GetInterfaces' , True),
('GetTagTypes' , []),
('AddTagType' , True),
- ('AddInterface
Settin
g' , True),
+ ('AddInterface
Ta
g' , True),
('GetBootMedium' , True),
('GetNodeGroups' , True),
('AddNodeGroup' , True),
('GetBootMedium' , True),
('GetNodeGroups' , True),
('AddNodeGroup' , True),
@@
-28,7
+34,8
@@
server_methods = [ ('GetNodes' , []),
('AddSlice' , True),
('AddPersonToSlice' , True),
('AddSliceToNodes' , True),
('AddSlice' , True),
('AddPersonToSlice' , True),
('AddSliceToNodes' , True),
- ('AddSliceAttribute' , True),
+ ('DeleteSliceFromNodes' , True),
+ ('AddSliceTag' , True),
('AddPerson' , True),
('UpdatePerson' , True),
('AddRoleToPerson' , True),
('AddPerson' , True),
('UpdatePerson' , True),
('AddRoleToPerson' , True),
@@
-37,6
+44,14
@@
server_methods = [ ('GetNodes' , []),
('AddPersonKey' , True),
('GetPlcRelease', {'build': {'target-arch':'i386'}}),
('GetSites', []),
('AddPersonKey' , True),
('GetPlcRelease', {'build': {'target-arch':'i386'}}),
('GetSites', []),
+ ('GetSlices', [{'name':'dry_run_slice','node_ids':['dry_run']}]),
+ ('GetLeaseGranularity', 180),
+ ('AddLeases', True),
+ ('GetLeases', []),
+ ('DeleteLeases',True),
+ ('AddConfFile','True'),
+ ('GetSliceTags',[]),
+ ('system.listMethods',[]),
]
class TestApiserver:
]
class TestApiserver:
@@
-59,7
+74,15
@@
class TestApiserver:
return actual_method(*args)
def __init__(self,url,dry_run=False):
return actual_method(*args)
def __init__(self,url,dry_run=False):
- self.apiserver = xmlrpclib.Server(url,allow_none=True)
+ self.apiserver = xmlrpclib.Server
Proxy
(url,allow_none=True)
self.dry_run=dry_run
for (method,defaults) in server_methods:
setattr(self,method,TestApiserver.Callable(self.apiserver,dry_run,method,defaults))
self.dry_run=dry_run
for (method,defaults) in server_methods:
setattr(self,method,TestApiserver.Callable(self.apiserver,dry_run,method,defaults))
+
+ def set_dry_run (self, dry_run):
+ self.dry_run=dry_run
+ for (method,defaults) in server_methods:
+ getattr(self,method).dry_run = dry_run
+
+ def has_method (self, methodname):
+ return methodname in self.apiserver.system.listMethods()