From: Faiyaz Ahmed <faiyaza@cs.princeton.edu>
Date: Thu, 22 Jan 2009 18:42:17 +0000 (+0000)
Subject: Can disable slice HTB's via PLC_SlICE_PREFIX+_default: sliceattribute net_max_rate=-1
X-Git-Tag: NodeManager-1.8-1~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=28843cfb70c54f24a08aa32495eac70964c8b1f0;p=nodemanager.git

Can disable slice HTB's via PLC_SlICE_PREFIX+_default: sliceattribute net_max_rate=-1
---

diff --git a/bwmon.py b/bwmon.py
index 362820b..38a70cc 100644
--- a/bwmon.py
+++ b/bwmon.py
@@ -646,9 +646,37 @@ def sync(nmdbcopy):
     pickle.dump((version, slices, deaddb), f)
     f.close()
 
+
+def getDefaults(nmdbcopy):
+    '''
+    Get defaults from default slice's slice attributes.
+    '''
+    status = True
+    # default slice
+    dfltslice = nmdbcopy.get(PLC_SLICE_PREFIX+"_default")
+    if dfltslice: 
+        if dfltslice['rspec']['net_max_rate'] == -1:
+            allOff()
+            status = False
+    return status
+
+
+def allOff():
+   # Get/set special slice IDs
+    root_xid = bwlimit.get_xid("root")
+    default_xid = bwlimit.get_xid("default")
+    kernelhtbs = gethtbs(root_xid, default_xid)
+    if len(kernelhtbs):
+        logger.log("bwlimit:  Disabling all running HTBs.")
+        for htb in kernelhtbs.keys(): bwlimit.off(htb) 
+
+
 lock = threading.Event()
 def run():
-    """When run as a thread, wait for event, lock db, deep copy it, release it, run bwmon.GetSlivers(), then go back to waiting."""
+    """
+	When run as a thread, wait for event, lock db, deep copy it, release it, 
+	run bwmon.GetSlivers(), then go back to waiting.
+	"""
     logger.log("bwmon:  Thread started", 2)
     while True:
         lock.wait()
@@ -656,7 +684,9 @@ def run():
         database.db_lock.acquire()
         nmdbcopy = copy.deepcopy(database.db)
         database.db_lock.release()
-        try:  sync(nmdbcopy)
+        try:  
+			if getDefaults(nmdbcopy): sync(nmdbcopy)
+			else: logger.log("bwmon:  DISABLED.")
         except: logger.log_exc()
         lock.clear()