dbus service : Adding interface in methodID

diff --git a/cloudeebus/cloudeebus.py b/cloudeebus/cloudeebus.py
index 0f85747..82cb354 100755 (executable)
--- a/cloudeebus/cloudeebus.py
+++ b/cloudeebus/cloudeebus.py
@@ -379,9 +379,9 @@ class DynDBusClass():
     def add_body_method(self):
         if (self.methodToAdd != None):
             if (self.args_str != str()):
-                self.class_code.append_stmt("self.callback('" + self.methodToAdd + "', dbus_async_cb, dbus_async_err_cb, %s)" % self.args_str)
+                self.class_code.append_stmt("self.callback('" + self.methodToAdd + "', '" + self.ifName + "', " + "dbus_async_cb, dbus_async_err_cb, %s)" % self.args_str)
             else:        
-                self.class_code.append_stmt("self.callback('" + self.methodToAdd + "', dbus_async_cb, dbus_async_err_cb)")
+                self.class_code.append_stmt("self.callback('" + self.methodToAdd + "', '" + self.ifName + "', " + "dbus_async_cb, dbus_async_err_cb)")
 
     def add_body_signal(self):
         self.class_code.append_stmt("return") ## TODO: Remove and fix with code ad hoc
@@ -536,8 +536,8 @@ class CloudeebusService:
         else:
             raise Exception("No methodID " + methodId)
 
-    def srvCB(self, name, async_succes_cb, async_error_cb, *args):
-        methodId = self.srvName + "#" + self.agentObjectPath + "#" + name
+    def srvCB(self, name, ifName, async_succes_cb, async_error_cb, *args):
+        methodId = self.srvName + "#" + self.agentObjectPath + "#" + ifName + "#" + name
         cb = { 'successCB': async_succes_cb, 
                'errorCB': async_error_cb}
         if methodId not in self.servicePendingCalls:

diff --git a/doc/agent/client.html b/doc/agent/client.html
index c4afa73..ab0615d 100644 (file)
--- a/doc/agent/client.html
+++ b/doc/agent/client.html
@@ -51,10 +51,10 @@ function signalHandler(aSum) {
 
 function gotProxy(proxy) {
   logCB(proxy);
+  proxy.connectToSignal("org.cloudeebus.Sample", "ResultChanged", signalHandler);
   for (var i=-10; i<10; i++)
     proxy.Add(i,i*2,gotAddResult,errorCB);
   sampleProxy = proxy;
-  sampleProxy.connectToSignal("org.cloudeebus.Sample", "ResultChanged", signalHandler);
   
 }
 

diff --git a/doc/agent/server.html b/doc/agent/server.html
index f7720c5..221f477 100644 (file)
--- a/doc/agent/server.html
+++ b/doc/agent/server.html
@@ -54,8 +54,9 @@ function releaseCalled() {
 
 function serviceAdded(service) {
   var agentName = "/org/cloudeebus/Sample"; // = DBUS object name
-  cloudeebus.SessionBus().service.registerMethod(service.name + "#" + agentName + "#Add",addCalled);
-  cloudeebus.SessionBus().service.registerMethod(service.name + "#" + agentName + "#Release",releaseCalled);
+  var ifName = "org.cloudeebus.Sample"
+  cloudeebus.SessionBus().service.registerMethod(service.name + "#" + agentName + "#" + ifName + "#Add",addCalled);
+  cloudeebus.SessionBus().service.registerMethod(service.name + "#" + agentName + "#" + ifName + "#Release",releaseCalled);
   cloudeebus.SessionBus().service.addAgent(agentName, sampleXml, logCB, errorCB);
 }