################################################################################
class DynDBusClass():
def __init__(self, className, globalCtx, localCtx):
- self.className = className
self.xmlCB = XmlCbParser(self)
self.signature = {}
self.class_code = ExecCode(globalCtx, localCtx)
self.class_code.indent_increment = 4
self.class_code.append_stmt("import dbus")
self.class_code.append_stmt("\n")
- self.class_code.append_stmt("class " + self.className + "(dbus.service.Object):")
+ self.class_code.append_stmt("class " + className + "(dbus.service.Object):")
self.class_code.indent()
## Overload of __init__ method
self.def_method("__init__")
- self.add_method("bus, callback=None, objPath='/sample', busName='org.cloudeebus'")
+ self.add_method("bus, callback=None, objPath='/sample', srvName='org.cloudeebus'")
self.add_stmt("self.bus = bus")
self.add_stmt("self.objPath = objPath")
+ self.add_stmt("self.srvName = srvName")
self.add_stmt("self.callback = callback")
- self.add_stmt("dbus.service.Object.__init__(self, conn=bus, bus_name=busName)")
+ self.add_stmt("dbus.service.Object.__init__(self, conn=bus, bus_name=srvName)")
self.end_method()
## Create 'add_to_connection' method
def add_body_method(self):
if (self.methodToAdd != None):
if (self.args_str != str()):
- self.class_code.append_stmt("self.callback('" + self.methodToAdd + "', self.objPath, '" + self.ifName + "', " + "dbus_async_cb, dbus_async_err_cb, %s)" % self.args_str)
+ self.class_code.append_stmt("self.callback(self.srvName,'" + self.methodToAdd + "', self.objPath, '" + self.ifName + "', " + "dbus_async_cb, dbus_async_err_cb, %s)" % self.args_str)
else:
- self.class_code.append_stmt("self.callback('" + self.methodToAdd + "', self.objPath, '" + self.ifName + "', " + "dbus_async_cb, dbus_async_err_cb)")
+ self.class_code.append_stmt("self.callback(self.srvName,'" + self.methodToAdd + "', self.objPath, '" + 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
else:
raise Exception("No methodID " + methodId)
- def srvCB(self, name, objPath, ifName, async_succes_cb, async_error_cb, *args):
- methodId = self.srvName + "#" + objPath + "#" + ifName + "#" + name
+ def srvCB(self, srvName, name, objPath, ifName, async_succes_cb, async_error_cb, *args):
+ methodId = srvName + "#" + objPath + "#" + ifName + "#" + name
cb = { 'successCB': async_succes_cb,
'errorCB': async_error_cb}
if methodId not in self.servicePendingCalls:
'''
busName = list[0]
self.bus = cache.dbusConnexion( busName )
- self.srvName = list[1]
+ srvName = list[1]
if not OPENDOOR and (SERVICELIST == [] or SERVICELIST != [] and self.permissions['services'] == None):
- SERVICELIST.index(self.srvName)
+ SERVICELIST.index(srvName)
- if (self.services.has_key(self.srvName) == False):
- self.services[self.srvName] = dbus.service.BusName(name = self.srvName, bus = self.bus)
- return self.srvName
+ if (self.services.has_key(srvName) == False):
+ self.services[srvName] = dbus.service.BusName(name = srvName, bus = self.bus)
+ return srvName
@exportRpc
def serviceRelease(self, list):
'''
arguments: busName, srvName
'''
- self.srvName = list[0]
- if (self.services.has_key(self.srvName) == True):
- self.services.pop(self.srvName)
- return self.srvName
+ srvName = list[0]
+ if (self.services.has_key(srvName) == True):
+ self.services.pop(srvName)
+ return srvName
else:
- raise Exception(self.srvName + " does not exist")
+ raise Exception(srvName + " does not exist")
@exportRpc
def serviceAddAgent(self, list):
'''
arguments: objectPath, xmlTemplate
'''
- self.agentObjectPath = list[0]
- xmlTemplate = list[1]
- self.className = createClassName(self.agentObjectPath)
- if (self.dynDBusClasses.has_key(self.className) == False):
- self.dynDBusClasses[self.className] = DynDBusClass(self.className, self.globalCtx, self.localCtx)
- self.dynDBusClasses[self.className].createDBusServiceFromXML(xmlTemplate)
- self.dynDBusClasses[self.className].declare()
+ srvName = list[0]
+ agentObjectPath = list[1]
+ xmlTemplate = list[2]
+ className = createClassName(agentObjectPath)
+ if (self.dynDBusClasses.has_key(className) == False):
+ self.dynDBusClasses[className] = DynDBusClass(className, self.globalCtx, self.localCtx)
+ self.dynDBusClasses[className].createDBusServiceFromXML(xmlTemplate)
+ self.dynDBusClasses[className].declare()
## Class already exist, instanciate it if not already instanciated
- if (self.serviceAgents.has_key(self.className) == False):
- self.serviceAgents[self.className] = eval(self.className + "(self.bus, callback=self.srvCB, objPath=self.agentObjectPath, busName=self.srvName)", self.globalCtx, self.localCtx)
+ if (self.serviceAgents.has_key(className) == False):
+ self.serviceAgents[className] = eval(className + "(self.bus, callback=self.srvCB, objPath='" + agentObjectPath + "', srvName='" + srvName + "')", self.globalCtx, self.localCtx)
- self.serviceAgents[self.className].add_to_connection()
- return (self.agentObjectPath)
+ self.serviceAgents[className].add_to_connection()
+ return (agentObjectPath)
@exportRpc
def serviceDelAgent(self, list):
'''
agentObjectPath = list[0]
className = createClassName(agentObjectPath)
+
+ print 'PY Try to remove ' + className
if (self.serviceAgents.has_key(className)):
- self.serviceAgents[self.className].remove_from_connection()
- self.serviceAgents.pop(self.className)
+ self.serviceAgents[className].remove_from_connection()
+ self.serviceAgents.pop(className)
else:
raise Exception(agentObjectPath + " doesn't exist!")
ipAllowed = ip
mask = "255.255.255.255"
NETMASK.append( {'ipAllowed': ipV4ToHex(ipAllowed), 'mask' : ipV4ToHex(mask)} )
-
- if args.debug:
- print "OPENDOOR='" + str(OPENDOOR) + "'"
- print "CREDENTIALS='" + str(args.credentials) + "'"
- print "WHITELIST='" + str(args.whitelist) + "'"
- print "SERVICELIST='" + str(args.servicelist) + "'"
- print "NETMASK='" + str(args.netmask) + "'"
- print
-
+
uri = "ws://localhost:" + args.port
factory = WampServerFactory(uri, debugWamp = args.debug)
projects / contrib / cloudeebus.git / blobdiff