[haizea-commit] r755 - branches/1.1/tests
haizea-commit at mailman.cs.uchicago.edu
haizea-commit at mailman.cs.uchicago.edu
Tue Jan 12 17:46:21 CST 2010
Author: borja
Date: 2010-01-12 17:46:21 -0600 (Tue, 12 Jan 2010)
New Revision: 755
Added:
branches/1.1/tests/pricedeadline.lwf
Modified:
branches/1.1/tests/base_config_simulator.conf
branches/1.1/tests/common.py
branches/1.1/tests/deadline1.lwf
branches/1.1/tests/deadline5.lwf
branches/1.1/tests/deadline8.lwf
branches/1.1/tests/test_deadline.py
branches/1.1/tests/test_simul_pricing.py
Log:
Changes to deadline tests. Added deadline+pricing test. Small fixes.
Modified: branches/1.1/tests/base_config_simulator.conf
===================================================================
--- branches/1.1/tests/base_config_simulator.conf 2010-01-12 23:45:22 UTC (rev 754)
+++ branches/1.1/tests/base_config_simulator.conf 2010-01-12 23:46:21 UTC (rev 755)
@@ -23,7 +23,7 @@
backfilling: aggressive
# backfilling-reservations: 4
enactment-overhead: 0
-override-suspend-time: 0
+#override-suspend-time: 0
suspension: all
suspend-rate: 32
resume-rate: 32
Modified: branches/1.1/tests/common.py
===================================================================
--- branches/1.1/tests/common.py 2010-01-12 23:45:22 UTC (rev 754)
+++ branches/1.1/tests/common.py 2010-01-12 23:46:21 UTC (rev 755)
@@ -34,6 +34,13 @@
if lease.deadline != None:
assert lease.end <= lease.deadline
+
+ if lease.duration.known != None:
+ duration = lease.duration.known
+ else:
+ duration = lease.duration.requested
+
+ assert duration == lease.duration.actual
def _verify_rejected(self, ids):
for id in ids:
Modified: branches/1.1/tests/deadline1.lwf
===================================================================
--- branches/1.1/tests/deadline1.lwf 2010-01-12 23:45:22 UTC (rev 754)
+++ branches/1.1/tests/deadline1.lwf 2010-01-12 23:46:21 UTC (rev 755)
@@ -27,7 +27,7 @@
<exact time="00:30:00.00"/>
</start>
<duration time="00:30:00.00"/>
- <deadline time="01:30:00.00"/>
+ <deadline time="01:45:00.00"/>
<software>
<disk-image id="foobar1.img" size="1024"/>
</software>
Modified: branches/1.1/tests/deadline5.lwf
===================================================================
--- branches/1.1/tests/deadline5.lwf 2010-01-12 23:45:22 UTC (rev 754)
+++ branches/1.1/tests/deadline5.lwf 2010-01-12 23:46:21 UTC (rev 755)
@@ -24,16 +24,16 @@
</node-set>
</nodes>
<start>
- <exact time="01:00:00.00"/>
+ <exact time="00:30:00.00"/>
</start>
- <duration time="00:30:00.00"/>
- <deadline time="01:30:00.00"/>
+ <duration time="01:00:00.00"/>
+ <deadline time="02:15:00.00"/>
<software>
<disk-image id="foobar1.img" size="1024"/>
</software>
</lease>
</lease-request>
- <lease-request arrival="00:15:00.00">
+ <lease-request arrival="00:45:00.00">
<lease id="2" preemptible="true">
<nodes>
<node-set numnodes="4">
@@ -42,10 +42,10 @@
</node-set>
</nodes>
<start>
- <exact time="00:30:00.00"/>
+ <exact time="01:00:00.00"/>
</start>
- <duration time="01:00:00.00"/>
- <deadline time="02:00:00.00"/>
+ <duration time="00:30:00.00"/>
+ <deadline time="01:30:00.00"/>
<software>
<disk-image id="foobar1.img" size="1024"/>
</software>
Modified: branches/1.1/tests/deadline8.lwf
===================================================================
--- branches/1.1/tests/deadline8.lwf 2010-01-12 23:45:22 UTC (rev 754)
+++ branches/1.1/tests/deadline8.lwf 2010-01-12 23:46:21 UTC (rev 755)
@@ -24,7 +24,7 @@
</node-set>
</nodes>
<start>
- <exact time="00:30:00.00"/>
+ <exact time="01:00:00.00"/>
</start>
<duration time="00:30:00.00"/>
<deadline time="01:30:00.00"/>
Added: branches/1.1/tests/pricedeadline.lwf
===================================================================
--- branches/1.1/tests/pricedeadline.lwf (rev 0)
+++ branches/1.1/tests/pricedeadline.lwf 2010-01-12 23:46:21 UTC (rev 755)
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<lease-workload name="deadline5">
+ <description>
+ ...
+ </description>
+
+ <site>
+ <resource-types names="CPU Memory"/>
+ <nodes>
+ <node-set numnodes="4">
+ <res type="CPU" amount="100"/>
+ <res type="Memory" amount="1024"/>
+ </node-set>
+ </nodes>
+ </site>
+ <lease-requests>
+
+ <lease-request arrival="00:00:00.00">
+ <lease id="1" preemptible="true">
+ <nodes>
+ <node-set numnodes="4">
+ <res amount="100" type="CPU"/>
+ <res amount="1024" type="Memory"/>
+ </node-set>
+ </nodes>
+ <start>
+ <exact time="00:30:00.00"/>
+ </start>
+ <duration time="01:00:00.00"/>
+ <deadline time="02:15:00.00"/>
+ <software>
+ <disk-image id="foobar1.img" size="1024"/>
+ </software>
+ <extra>
+ <attr name="simul_pricemarkup" value="10.0"/>
+ </extra>
+ </lease>
+ </lease-request>
+ <lease-request arrival="00:45:00.00">
+ <lease id="2" preemptible="true">
+ <nodes>
+ <node-set numnodes="4">
+ <res amount="100" type="CPU"/>
+ <res amount="1024" type="Memory"/>
+ </node-set>
+ </nodes>
+ <start>
+ <exact time="01:00:00.00"/>
+ </start>
+ <duration time="00:30:00.00"/>
+ <deadline time="01:30:00.00"/>
+ <software>
+ <disk-image id="foobar1.img" size="1024"/>
+ </software>
+ <extra>
+ <attr name="simul_pricemarkup" value="10.0"/>
+ </extra>
+ </lease>
+ </lease-request>
+ </lease-requests>
+</lease-workload>
+
\ No newline at end of file
Modified: branches/1.1/tests/test_deadline.py
===================================================================
--- branches/1.1/tests/test_deadline.py 2010-01-12 23:45:22 UTC (rev 754)
+++ branches/1.1/tests/test_deadline.py 2010-01-12 23:46:21 UTC (rev 755)
@@ -5,8 +5,8 @@
def __init__(self):
config = BaseTest.load_configfile("base_config_simulator.conf")
BaseTest.__init__(self, config)
- self.config.set("scheduling", "policy-preemption", "no-preemption")
- self.config.set("scheduling", "suspension", "none")
+ self.config.set("scheduling", "policy-preemption", "deadline")
+ self.config.set("scheduling", "suspension", "all")
def test_deadline1(self):
self._tracefile_test("deadline1.lwf")
Modified: branches/1.1/tests/test_simul_pricing.py
===================================================================
--- branches/1.1/tests/test_simul_pricing.py 2010-01-12 23:45:22 UTC (rev 754)
+++ branches/1.1/tests/test_simul_pricing.py 2010-01-12 23:46:21 UTC (rev 755)
@@ -22,4 +22,12 @@
self.config.set("scheduling", "policy-pricing", "always-fair")
self.config.set("pricing", "fair-rate", "0.10")
self._tracefile_test("price2.lwf")
- self._verify_rejected_by_user([1])
\ No newline at end of file
+ self._verify_rejected_by_user([1])
+
+ def test_pricing_surcharge(self):
+ self.config.set("scheduling", "policy-preemption", "deadline")
+ self.config.set("scheduling", "suspension", "all")
+ self.config.set("scheduling", "policy-pricing", "always-fair")
+ self.config.set("pricing", "fair-rate", "0.10")
+ self._tracefile_test("pricedeadline.lwf")
+ self._verify_done([1])
\ No newline at end of file
More information about the Haizea-commit
mailing list