[svn] commit: r335 - in /branches/parkinglot/src: bin/bigtool/run_bigtool.py bin/parkinglot/ccsession.cc lib/cc/cpp/session.cc lib/cc/cpp/session.h lib/cc/python/ISC/CC/session.py

[BIND 10 source code commits]

Author: mgraff
Date: Thu Dec  3 07:32:29 2009
New Revision: 335

Log:
kill API support for subscription types.  'meonly' is the default.  Comment out lines in callers which used 'meonly'

Modified:
    branches/parkinglot/src/bin/bigtool/run_bigtool.py
    branches/parkinglot/src/bin/parkinglot/ccsession.cc
    branches/parkinglot/src/lib/cc/cpp/session.cc
    branches/parkinglot/src/lib/cc/cpp/session.h
    branches/parkinglot/src/lib/cc/python/ISC/CC/session.py

Modified: branches/parkinglot/src/bin/bigtool/run_bigtool.py
==============================================================================
--- branches/parkinglot/src/bin/bigtool/run_bigtool.py (original)
+++ branches/parkinglot/src/bin/bigtool/run_bigtool.py Thu Dec  3 07:32:29 2009
@@ -32,9 +32,9 @@
 if __name__ == '__main__':
     try:
         cc = ISC.CC.Session()
-        cc.group_subscribe("BigTool", "*", "meonly")
-        cc.group_subscribe("ConfigManager", "*", "meonly")
-        cc.group_subscribe("Boss", "*", "meonly")
+        #cc.group_subscribe("BigTool", "*", "meonly")
+        #cc.group_subscribe("ConfigManager", "*", "meonly")
+        #cc.group_subscribe("Boss", "*", "meonly")
 
         tool = BigTool(cc)
         _prepare_fake_data(tool)   

Modified: branches/parkinglot/src/bin/parkinglot/ccsession.cc
==============================================================================
--- branches/parkinglot/src/bin/parkinglot/ccsession.cc (original)
+++ branches/parkinglot/src/bin/parkinglot/ccsession.cc Thu Dec  3 07:32:29 2009
@@ -42,8 +42,8 @@
         session_.establish();
         session_.subscribe("ParkingLot", "*");
         session_.subscribe("Boss", "ParkingLot");
-        session_.subscribe("ConfigManager", "*", "meonly");
-        session_.subscribe("statistics", "*", "meonly");
+        //session_.subscribe("ConfigManager", "*", "meonly");
+        //session_.subscribe("statistics", "*", "meonly");
     } catch (...) {
         throw std::runtime_error("SessionManager: failed to open sessions");
     }

Modified: branches/parkinglot/src/lib/cc/cpp/session.cc
==============================================================================
--- branches/parkinglot/src/lib/cc/cpp/session.cc (original)
+++ branches/parkinglot/src/lib/cc/cpp/session.cc Thu Dec  3 07:32:29 2009
@@ -197,14 +197,13 @@
 }
 
 void
-Session::subscribe(std::string group, std::string instance, std::string subtype)
+Session::subscribe(std::string group, std::string instance)
 {
     ElementPtr env = Element::create(std::map<std::string, ElementPtr>());
 
     env->set("type", Element::create("subscribe"));
     env->set("group", Element::create(group));
     env->set("instance", Element::create(instance));
-    env->set("subtype", Element::create(subtype));
 
     sendmsg(env);
 }

Modified: branches/parkinglot/src/lib/cc/cpp/session.h
==============================================================================
--- branches/parkinglot/src/lib/cc/cpp/session.h (original)
+++ branches/parkinglot/src/lib/cc/cpp/session.h Thu Dec  3 07:32:29 2009
@@ -43,8 +43,7 @@
                          ISC::Data::ElementPtr& msg,
                          bool nonblock = true);
             void subscribe(std::string group,
-                           std::string instance = "*",
-                           std::string subtype = "normal");
+                           std::string instance = "*");
             void unsubscribe(std::string group,
                              std::string instance = "*");
             unsigned int group_sendmsg(ISC::Data::ElementPtr& msg,

Modified: branches/parkinglot/src/lib/cc/python/ISC/CC/session.py
==============================================================================
--- branches/parkinglot/src/lib/cc/python/ISC/CC/session.py (original)
+++ branches/parkinglot/src/lib/cc/python/ISC/CC/session.py Thu Dec  3 07:32:29 2009
@@ -125,13 +125,11 @@
         self._sequence += 1
         return self._sequence
 
-    def group_subscribe(self, group, instance = "*", subtype = "normal"):
-        """subtype can be 'normal' or 'meonly'"""
+    def group_subscribe(self, group, instance = "*"):
         self.sendmsg({
             "type": "subscribe",
             "group": group,
             "instance": instance,
-            "subtype": subtype,
         })
 
     def group_unsubscribe(self, group, instance = "*"):