[svn] commit: r70 - in /experiments/graff-ccapi/python: ISC/CC/session.py test.py

[BIND 10 source code commits]

Author: mgraff
Date: Wed Oct  7 16:27:02 2009
New Revision: 70

Log:
fix up a few errors, send/receive group messages works

Modified:
    experiments/graff-ccapi/python/ISC/CC/session.py
    experiments/graff-ccapi/python/test.py

Modified: experiments/graff-ccapi/python/ISC/CC/session.py
==============================================================================
--- experiments/graff-ccapi/python/ISC/CC/session.py (original)
+++ experiments/graff-ccapi/python/ISC/CC/session.py Wed Oct  7 16:27:02 2009
@@ -74,7 +74,6 @@
             if not data: # server closed connection
                 return None
 
-            print len(data)
             self._recvbuffer += data
             if len(self._recvbuffer) < 4:
                 return None
@@ -95,7 +94,7 @@
         self._sequence += 1
         return self._sequence
 
-    def group_subscribe(group, instance = "*", subtype = "normal"):
+    def group_subscribe(self, group, instance = "*", subtype = "normal"):
         self.sendmsg({
             "type": "subscribe",
             "group": group,
@@ -103,14 +102,14 @@
             "subtype": subtype,
         })
 
-    def group_unsubscribe(group, instance = "*"):
+    def group_unsubscribe(self, group, instance = "*"):
         self.sendmsg({
             "type": "unsubscribe",
             "group": group,
             "instance": instance,
         })
 
-    def group_sendmsg(msg, group, instance = "*", to = "*"):
+    def group_sendmsg(self, msg, group, instance = "*", to = "*"):
         m = Message()
         self.sendmsg({
             "type": "send",
@@ -122,8 +121,8 @@
             "msg": m.to_wire(msg),
         })
 
-    def group_recvmsg(nonblock = True):
-        msg = recvmsg(nonblock)
+    def group_recvmsg(self, nonblock = True):
+        msg = self.recvmsg(nonblock)
         if msg == None:
             return None
         m = Message()

Modified: experiments/graff-ccapi/python/test.py
==============================================================================
--- experiments/graff-ccapi/python/test.py (original)
+++ experiments/graff-ccapi/python/test.py Wed Oct  7 16:27:02 2009
@@ -14,3 +14,11 @@
 
 tcp = ISC.CC.Session()
 print tcp.lname
+
+tcp.group_subscribe("test")
+
+counter = 0
+while counter < 10000:
+    tcp.group_sendmsg({ "counter": counter }, "test", "foo")
+    routing, data = tcp.group_recvmsg(False)
+    counter += 1