X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestApiserver.py;h=ea8530014ddf44d6a7389a9ff48f99b8968b0ac1;hb=3d1f6209d1edf3fef30c3f28d930592d26e1966b;hp=baf8dec40054f308c2e7e363d91523220385d063;hpb=c6fa2d88257b561ce7180657cd6fdd32687fe089;p=tests.git

diff --git a/system/TestApiserver.py b/system/TestApiserver.py
index baf8dec..ea85300 100644
--- a/system/TestApiserver.py
+++ b/system/TestApiserver.py
@@ -1,4 +1,6 @@
-# $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
@@ -10,6 +12,8 @@ server_methods = [ ('GetNodes' ,  []),
                    ('DeleteNode' , True),
                    ('UpdateNode' , True),
                    ('AddInterface' , True),
+                   ('AddIpAddress' , True),
+                   ('AddRoute' , True),
                    ('GetInterfaces' , True),
                    ('GetTagTypes' , []),
                    ('AddTagType' , True),
@@ -30,6 +34,7 @@ server_methods = [ ('GetNodes' ,  []),
                    ('AddSlice' , True),
                    ('AddPersonToSlice' , True),
                    ('AddSliceToNodes' , True),
+                   ('DeleteSliceFromNodes' , True),
                    ('AddSliceTag' , True),
                    ('AddPerson' , True),
                    ('UpdatePerson' , True),
@@ -39,10 +44,14 @@ server_methods = [ ('GetNodes' ,  []),
                    ('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:
@@ -65,7 +74,7 @@ class TestApiserver:
                 return actual_method(*args)
 
     def __init__(self,url,dry_run=False):
-        self.apiserver = xmlrpclib.Server(url,allow_none=True)
+        self.apiserver = xmlrpclib.ServerProxy(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))
@@ -74,3 +83,6 @@ class TestApiserver:
         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()