fix xmlrpc interface

diff --git a/aspects/omfaspects.py b/aspects/omfaspects.py
index 406d7db..a9bc179 100644 (file)
--- a/aspects/omfaspects.py
+++ b/aspects/omfaspects.py
@@ -130,16 +130,16 @@ class OMFAspect_xmlrpc(BaseOMF):
         self.server = xmlrpclib.ServerProxy(slicemgr_url)
 
     def create_slice(self, slice):
-        self.server.slicemgr.createSlice(slice)
+        self.server.createSlice(slice)
 
     def add_resource(self, slice, resource):
-        self.server.slicemgr.addResource(slice, resource)
+        self.server.addResource(slice, resource)
 
     def delete_slice(self, slice):
-        self.server.slicemgr.deleteSlice(slice)
+        self.server.deleteSlice(slice)
         
     def delete_resource(self, slice, resource):
-        self.server.slicemgr.removeResource(slice, resource)
+        self.server.removeResource(slice, resource)
 
     def before(self, wobj, data, *args, **kwargs):
         BaseOMF.before(self, wobj, data, *args, **kwargs)

diff --git a/omf/omf-slicemgr.py b/omf/omf-slicemgr.py
index f1bf1d1..8b2af22 100644 (file)
--- a/omf/omf-slicemgr.py
+++ b/omf/omf-slicemgr.py
@@ -192,17 +192,17 @@ class PubSubClient(BaseClient):
 
 
 
-class Slicemgr(PubSubClient, xmlrpc.XMLRPC):
+class Slicemgr(xmlrpc.XMLRPC, PubSubClient):
     
     DOMAIN = "/OMF"
     RESOURCES = 'resources'
 
     def __init__(self, id, secret, verbose = False, log = None):
+        xmlrpc.XMLRPC.__init__(self, allowNone=True)
         PubSubClient.__init__(self, id, secret, verbose = verbose, log = log)
         self.command_queue = Queue.Queue()
 
-        # for xmlrpc interface
-        self.allowNone = True
+        xmlrpc.addIntrospection(self)
 
     def xmlrpc_createSlice(self, slice):
         self.create_slice(slice)