X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=omf%2Fomf_slicemgr.py;h=0285e8b58cd2061795e25ffa9fff69aa360d3cf1;hb=8aee29a0a73baef4f5bdc74ab42837a1a2ab8b8c;hp=2f2dc1384d78e6d9eba22dbcf5a02b516d862763;hpb=2780ce3f3e5636f346809f764aaf51a33818c7f2;p=plcapi.git diff --git a/omf/omf_slicemgr.py b/omf/omf_slicemgr.py index 2f2dc13..0285e8b 100644 --- a/omf/omf_slicemgr.py +++ b/omf/omf_slicemgr.py @@ -108,7 +108,6 @@ class PubSubClient(BaseClient): def __init__(self, id, secret, verbose = False, log = None): BaseClient.__init__(self, id, secret, verbose = verbose, log = log) self.hooks = {} - self.requests = {} def add_result_hook(self, hook_to, hook): self.hooks[hook_to] = hook @@ -119,6 +118,7 @@ class PubSubClient(BaseClient): def event_authenticated(self, xs): BaseClient.event_authenticated(self, xs) + self.requests = {} xs.addObserver("/iq/pubsub/create", self.result_create_node) xs.addObserver("/iq/pubsub/delete", self.result_delete_node) xs.addObserver("/iq/query[@xmlns='http://jabber.org/protocol/disco#items']", self.result_discover) @@ -129,7 +129,7 @@ class PubSubClient(BaseClient): def __iq(self, t="get"): iq = domish.Element((None, "iq")) iq['from'] = self.id.full() - iq['to'] = "pubsub.vplc27.inria.fr" + iq['to'] = "pubsub.%s" % self.id.host iq['type'] = t iq.addUniqueId() return iq @@ -371,6 +371,10 @@ if __name__ == "__main__": t = task.LoopingCall(slicemgr.flush_commands) t.start(5.0) # check every 5 seconds + + reactor.callLater(1, slicemgr.create_node, "/OMF") + reactor.callLater(1, slicemgr.create_node, "/OMF/SYSTEM") + reactor.connectTCP(slicemgr.id.host, 5222, slicemgr.factory) reactor.listenTCP(5053, server.Site(slicemgr), interface="localhost") reactor.run(installSignalHandlers=True)