reviewed list options parsing

[tests.git] / system / TestApiserver.py

diff --git a/system/TestApiserver.py b/system/TestApiserver.py
index cc80f8b..d0cdc8c 100644 (file)
--- a/system/TestApiserver.py
+++ b/system/TestApiserver.py
@@ -1,22 +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),
                    ('GetTagTypes' , []),
                    ('AddTagType' , True),
-                   ('AddInterfaceSetting' , True),
+                   ('AddInterfaceTag' , True),
                    ('GetBootMedium' , True),
                    ('GetNodeGroups' , True),
                    ('AddNodeGroup' , True),
                    ('DeleteNodeGroup', True),
                    ('GetNodeTags', True),
+                   ('AddNodeTag', True),
                    ('AddInitScript' , True),
                    ('DeleteInitScript', True),
                    ('GetInitScripts', True),
@@ -27,7 +32,7 @@ server_methods = [ ('GetNodes' ,  []),
                    ('AddSlice' , True),
                    ('AddPersonToSlice' , True),
                    ('AddSliceToNodes' , True),
-                   ('AddSliceAttribute' , True),
+                   ('AddSliceTag' , True),
                    ('AddPerson' , True),
                    ('UpdatePerson' , True),
                    ('AddRoleToPerson' , True),
@@ -36,6 +41,10 @@ server_methods = [ ('GetNodes' ,  []),
                    ('AddPersonKey' , True),
                    ('GetPlcRelease', {'build': {'target-arch':'i386'}}),
                    ('GetSites', []),
+                   ('GetLeaseGranularity', 180),
+                   ('AddLeases', True),
+                   ('GetLeases', []),
+                   ('DeleteLeases',True),
                    ]
 
 class TestApiserver:
@@ -62,3 +71,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