X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestApiserver.py;h=29bdebc3317caa8a138ac45d6846009fcaa5a501;hb=7e091116edb3263daceb18ef3ae3467999184722;hp=5459abf4953c33353fe200508cd5e020d3970547;hpb=070ac7cd04e9258f40fba3757c809388f60bdb55;p=tests.git

diff --git a/system/TestApiserver.py b/system/TestApiserver.py
index 5459abf..29bdebc 100644
--- a/system/TestApiserver.py
+++ b/system/TestApiserver.py
@@ -1,24 +1,27 @@
-# $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
 
+# the default value is for the dry run mode
 server_methods = [ ('GetNodes' ,  []),
                    ('AddNode' , True),
+                   ('SetNodePlainBootstrapfs', True),
                    ('DeleteNode' , True),
                    ('UpdateNode' , True),
                    ('AddInterface' , True),
                    ('GetInterfaces' , True),
-                   ('GetInterfaceSettingTypes' , True),
-                   ('AddInterfaceSettingType' , True),
-                   ('AddInterfaceSetting' , True),
+                   ('GetTagTypes' , []),
+                   ('AddTagType' , True),
+                   ('AddInterfaceTag' , True),
                    ('GetBootMedium' , True),
                    ('GetNodeGroups' , True),
                    ('AddNodeGroup' , True),
-                   ('GetNodeTagTypes' , True),
-                   ('AddNodeTagType', True),
-                   ('AddNodeTag', True),
+                   ('DeleteNodeGroup', True),
                    ('GetNodeTags', True),
+                   ('AddNodeTag', True),
                    ('AddInitScript' , True),
                    ('DeleteInitScript', True),
                    ('GetInitScripts', True),
@@ -29,7 +32,7 @@ server_methods = [ ('GetNodes' ,  []),
                    ('AddSlice' , True),
                    ('AddPersonToSlice' , True),
                    ('AddSliceToNodes' , True),
-                   ('AddSliceAttribute' , True),
+                   ('AddSliceTag' , True),
                    ('AddPerson' , True),
                    ('UpdatePerson' , True),
                    ('AddRoleToPerson' , True),
@@ -37,6 +40,12 @@ server_methods = [ ('GetNodes' ,  []),
                    ('DeletePerson' , True),
                    ('AddPersonKey' , True),
                    ('GetPlcRelease', {'build': {'target-arch':'i386'}}),
+                   ('GetSites', []),
+                   ('GetSlices', [{'name':'dry_run_slice'}]),
+                   ('GetLeaseGranularity', 180),
+                   ('AddLeases', True),
+                   ('GetLeases', []),
+                   ('DeleteLeases',True),
                    ]
 
 class TestApiserver:
@@ -63,3 +72,8 @@ class TestApiserver:
         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