added create_network(), delete_network(), create_subnet(), delete_subnet(), process_t...

[plcapi.git] / omf / omf_slicemgr.py

diff --git a/omf/omf_slicemgr.py b/omf/omf_slicemgr.py
index 3ad62c7..7f6e8b0 100644 (file)
--- a/omf/omf_slicemgr.py
+++ b/omf/omf_slicemgr.py
@@ -69,7 +69,7 @@ class BaseClient(object):
         # add protocol handlers
         xs.addObserver("/presence[@type='subscribe']", self.presence_subscribe)
         xs.addObserver("/presence[@type='unsubscribe']", self.presence_unsubscribe)
-        xs.addObserver("/precence", self.presence)
+        xs.addObserver("/presence", self.presence)
         xs.addObserver("/message[@type='chat']", self.message_chat)
 
     def presence_subscribe(self, m):
@@ -90,8 +90,9 @@ class BaseClient(object):
     def presence(self, m):
         p = domish.Element(("jabber:client", "presence"))
         p['from'], p['to'] = m['to'], m['from']
-        presence.addElement("show", content="dnd")
-        presence.addElement("status", content="man at work")
+        # initially read presence.addElement, my wild guess.. -- Thierry
+        p.addElement("show", content="dnd")
+        p.addElement("status", content="man at work")
         self.xmlstream.send(p)
 
     def message_chat(self, m):
@@ -129,7 +130,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
@@ -345,7 +346,7 @@ class Slicemgr(xmlrpc.XMLRPC, PubSubClient):
             for i in iq.query.elements():
                 node = i['node']
                 if node.startswith(resource_prefix):
-                    self.command_que.put(self.delete_node, node)
+                    self.command_queue.put((self.delete_node, node))
 
         self.add_result_hook("discover", delete_slice_resources)
         self.discover()
@@ -371,6 +372,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)