[haizea-commit] r848 - branches/1.1/src/haizea/core

[haizea-commit at mailman.cs.uchicago.edu]

Author: borja
Date: 2010-11-29 10:29:39 -0600 (Mon, 29 Nov 2010)
New Revision: 848

Modified:
   branches/1.1/src/haizea/core/configfile.py
Log:
suspend-rate and resume-rate should only be required when using suspension.

Modified: branches/1.1/src/haizea/core/configfile.py
===================================================================
--- branches/1.1/src/haizea/core/configfile.py	2010-10-27 23:15:05 UTC (rev 847)
+++ branches/1.1/src/haizea/core/configfile.py	2010-11-29 16:29:39 UTC (rev 848)
@@ -293,7 +293,9 @@
      Option(name        = "suspend-rate",
             getter      = "suspend-rate",
             type        = OPTTYPE_FLOAT,
-            required    = True,
+            required    = False,
+            required_if = [(("scheduling","suspension"),constants.SUSPENSION_SERIAL),
+                           (("scheduling","suspension"),constants.SUSPENSION_ALL)],
             doc         = """
             Rate at which VMs are assumed to suspend (in MB of
             memory per second)                
@@ -302,7 +304,9 @@
      Option(name        = "resume-rate",
             getter      = "resume-rate",
             type        = OPTTYPE_FLOAT,
-            required    = True,
+            required    = False,
+            required_if = [(("scheduling","suspension"),constants.SUSPENSION_SERIAL),
+                           (("scheduling","suspension"),constants.SUSPENSION_ALL)],
             doc         = """
             Rate at which VMs are assumed to resume (in MB of
             memory per second)