Check for the existence of the Internet2 clique iptables rule and add if absent.

[nodemanager.git] / nm.py

diff --git a/nm.py b/nm.py
index f29d8b0..bb0a2ab 100755 (executable)
--- a/nm.py
+++ b/nm.py
@@ -1,4 +1,13 @@
 #!/usr/bin/python
+
+#
+# Useful information can be found at https://svn.planet-lab.org/wiki/NodeManager
+#
+
+# Faiyaz Ahmed <faiyaza at cs dot princeton dot edu>
+# Copyright (C) 2008 The Trustees of Princeton University
+
+
 """Node Manager"""
 
 import optparse
@@ -20,7 +29,7 @@ import net
 id="$Id$"
 savedargv = sys.argv[:]
 
-known_modules=['proper', 'conf_files', 'sm', 'bwmon']
+known_modules=['conf_files', 'sm', 'bwmon', 'vsys', 'codemux']
 
 parser = optparse.OptionParser()
 parser.add_option('-d', '--daemon', action='store_true', dest='daemon', default=False, help='run daemonized')
@@ -36,8 +45,14 @@ parser.add_option('-m', '--module', action='store', dest='module', default='', h
 modules = []
 
 def GetSlivers(plc):
-    try: data = plc.GetSlivers()
-    except: logger.log_exc()
+    '''Run call backs defined in modules'''
+    try: 
+        logger.log("Syncing w/ PLC")
+        data = plc.GetSlivers()
+    except: 
+        logger.log_exc()
+        #  XXX So some modules can at least boostrap.
+        data = {}
     if (options.verbose):
         logger.log_slivers(data)
     # Set i2 ip list for nodes in I2 nodegroup.