[haizea-commit] r591 - branches/TP2.0/tests

haizea-commit at mailman.cs.uchicago.edu haizea-commit at mailman.cs.uchicago.edu
Wed Jun 17 12:52:07 CDT 2009


Author: borja
Date: 2009-06-17 12:52:06 -0500 (Wed, 17 Jun 2009)
New Revision: 591

Added:
   branches/TP2.0/tests/sample_slottables.py
Modified:
   branches/TP2.0/tests/common.py
   branches/TP2.0/tests/test_slottable.py
Log:
- Factored out slottable creation code to sample_slottables module.
- Miscellaneous small fixes

Modified: branches/TP2.0/tests/common.py
===================================================================
--- branches/TP2.0/tests/common.py	2009-06-17 17:50:41 UTC (rev 590)
+++ branches/TP2.0/tests/common.py	2009-06-17 17:52:06 UTC (rev 591)
@@ -3,8 +3,8 @@
 import threading
 import shutil
 
-from haizea.resourcemanager.configfile import HaizeaConfig
-from haizea.resourcemanager.rm import ResourceManager
+from haizea.core.configfile import HaizeaConfig
+from haizea.core.haizea import Haizea
 
 class BaseTest(object):
     def __init__(self):
@@ -26,48 +26,48 @@
 
     def test_preemption(self):
         self.set_tracefile("preemption.lwf")
-        rm = ResourceManager(HaizeaConfig(self.config))
-        rm.start()
+        haizea = Haizea(HaizeaConfig(self.config))
+        haizea.start()
         
     def test_preemption_prematureend(self):
         self.set_tracefile("preemption_prematureend.lwf")
-        rm = ResourceManager(HaizeaConfig(self.config))
-        rm.start()
+        haizea = Haizea(HaizeaConfig(self.config))
+        haizea.start()
         
     def test_preemption_prematureend2(self):
         self.set_tracefile("preemption_prematureend2.lwf")
-        rm = ResourceManager(HaizeaConfig(self.config))
-        rm.start()
+        haizea = Haizea(HaizeaConfig(self.config))
+        haizea.start()
         
     def test_reservation(self):
         self.set_tracefile("reservation.lwf")
-        rm = ResourceManager(HaizeaConfig(self.config))
-        rm.start()
+        haizea = Haizea(HaizeaConfig(self.config))
+        haizea.start()
         
     def test_reservation_prematureend(self):
         self.set_tracefile("reservation_prematureend.lwf")
-        rm = ResourceManager(HaizeaConfig(self.config))
-        rm.start()
+        haizea = Haizea(HaizeaConfig(self.config))
+        haizea.start()
         
     def test_migrate(self):
         self.set_tracefile("migrate.lwf")
-        rm = ResourceManager(HaizeaConfig(self.config))
-        rm.start()
+        haizea = Haizea(HaizeaConfig(self.config))
+        haizea.start()
         
     def test_reuse1(self):
         self.set_tracefile("reuse1.lwf")
-        rm = ResourceManager(HaizeaConfig(self.config))
-        rm.start()
+        haizea = Haizea(HaizeaConfig(self.config))
+        haizea.start()
         
     def test_reuse2(self):
         self.set_tracefile("reuse2.lwf")
-        rm = ResourceManager(HaizeaConfig(self.config))
-        rm.start()
+        haizea = Haizea(HaizeaConfig(self.config))
+        haizea.start()
         
     def test_wait(self):
         self.set_tracefile("wait.lwf")
-        rm = ResourceManager(HaizeaConfig(self.config))
-        rm.start()
+        haizea = Haizea(HaizeaConfig(self.config))
+        haizea.start()
         
         
 class BaseOpenNebulaTest(BaseTest):
@@ -76,8 +76,8 @@
 
     def do_test(self, db):
         shutil.copyfile(db, "one.db")
-        rm = ResourceManager(HaizeaConfig(self.config))
-        rm.start()
+        haizea = Haizea(HaizeaConfig(self.config))
+        haizea.start()
         os.remove("one.db")
     
 
@@ -86,10 +86,10 @@
         self.haizea_thread = None
 
     def start(self):
-        self.rm = ResourceManager(HaizeaConfig(self.config))
-        self.haizea_thread = threading.Thread(target=self.rm.start)
+        self.haizea = Haizea(HaizeaConfig(self.config))
+        self.haizea_thread = threading.Thread(target=self.haizea.start)
         self.haizea_thread.start()
         
     def stop(self):
-        self.rm.stop()
+        self.haizea.stop()
         self.haizea_thread.join()
\ No newline at end of file

Added: branches/TP2.0/tests/sample_slottables.py
===================================================================
--- branches/TP2.0/tests/sample_slottables.py	                        (rev 0)
+++ branches/TP2.0/tests/sample_slottables.py	2009-06-17 17:52:06 UTC (rev 591)
@@ -0,0 +1,136 @@
+from haizea.core.leases import Lease
+from haizea.core.scheduler.resourcepool import Node
+from haizea.core.scheduler.slottable import ResourceTuple, SlotTable, ResourceReservation, AvailabilityWindow
+from mx import DateTime
+import haizea.common.constants as constants
+
+T1255 = DateTime.DateTime(2006,11,25,12,55)
+T1300 = DateTime.DateTime(2006,11,25,13,00)
+T1305 = DateTime.DateTime(2006,11,25,13,05)
+T1315 = DateTime.DateTime(2006,11,25,13,15)
+T1325 = DateTime.DateTime(2006,11,25,13,25)
+T1330 = DateTime.DateTime(2006,11,25,13,30)
+T1335 = DateTime.DateTime(2006,11,25,13,35)
+T1345 = DateTime.DateTime(2006,11,25,13,45)
+T1350 = DateTime.DateTime(2006,11,25,13,50)
+T1355 = DateTime.DateTime(2006,11,25,13,55)
+T1400 = DateTime.DateTime(2006,11,25,14,00)
+T1415 = DateTime.DateTime(2006,11,25,14,15)
+T1420 = DateTime.DateTime(2006,11,25,14,20)
+
+resource_types = [(constants.RES_CPU, constants.RESTYPE_FLOAT, "CPU"),
+                  (constants.RES_MEM,  constants.RESTYPE_INT, "Mem")]
+ResourceTuple.set_resource_types(resource_types)
+
+FULL_NODE = ResourceTuple.create_empty()
+FULL_NODE.set_by_type(constants.RES_CPU, 1.0)
+FULL_NODE.set_by_type(constants.RES_MEM, 1024)
+
+HALF_NODE = ResourceTuple.create_empty()
+HALF_NODE.set_by_type(constants.RES_CPU, 0.5)
+HALF_NODE.set_by_type(constants.RES_MEM, 512)
+
+QRTR_NODE = ResourceTuple.create_empty()
+QRTR_NODE.set_by_type(constants.RES_CPU, 0.25)
+QRTR_NODE.set_by_type(constants.RES_MEM, 256)
+
+EMPT_NODE = ResourceTuple.create_empty()
+        
+def sample_slottable_1():
+    slottable = SlotTable()  
+    slottable.add_node(Node(1, "test-1", FULL_NODE))
+    slottable.add_node(Node(2, "test-2", FULL_NODE))  
+    slottable.add_node(Node(3, "test-3", FULL_NODE))  
+    slottable.add_node(Node(4, "test-4", FULL_NODE))  
+
+    lease1 = Lease(None,None,None,None,None,1,None,None)
+    lease1.id = 1
+    res1 = {2: HALF_NODE}
+    rr1_1 = ResourceReservation(lease1, T1315, T1325, res1)
+    rr1_2 = ResourceReservation(lease1, T1325, T1330, res1)
+    slottable.add_reservation(rr1_1)
+    slottable.add_reservation(rr1_2)
+
+    lease2 = Lease(None,None,None,None,None,2,None,None)
+    lease2.id = 2
+    res2 = {2: FULL_NODE, 3: FULL_NODE}
+    rr2 = ResourceReservation(lease2, T1330, T1345, res2)
+    slottable.add_reservation(rr2)
+
+    lease3 = Lease(None,None,None,None,None,1,None,None)
+    lease3.id = 3
+    res3 = {4: FULL_NODE}
+    rr3_1 = ResourceReservation(lease3, T1330, T1355, res3)
+    rr3_2 = ResourceReservation(lease3, T1355, T1400, res3)
+    slottable.add_reservation(rr3_1)
+    slottable.add_reservation(rr3_2)
+
+    lease4 = Lease(None,None,None,None,None,1,None,None)
+    lease4.id = 4
+    res4 = {2: QRTR_NODE, 3: HALF_NODE}
+    rr4 = ResourceReservation(lease4, T1350, T1415, res4)
+    slottable.add_reservation(rr4)
+
+    lease5 = Lease(None,None,None,None,None,1,None,None)
+    lease5.id = 5
+    res5 = {2: QRTR_NODE}
+    rr5 = ResourceReservation(lease5, T1350, T1415, res5)
+    slottable.add_reservation(rr5)
+    
+    lease6 = Lease(None,None,None,None,None,1,None,None)
+    lease6.id = 6
+    res6 = {1: FULL_NODE}
+    rr6 = ResourceReservation(lease6, T1255, T1305, res6)
+    slottable.add_reservation(rr6)      
+    
+    return slottable, [lease1,lease2,lease3,lease4,lease5,lease6]
+        
+def sample_slottable_3():
+    slottable = SlotTable()
+
+    slottable.add_node(Node(1, "test-1", FULL_NODE))
+    slottable.add_node(Node(2, "test-2", FULL_NODE))  
+    slottable.add_node(Node(3, "test-3", FULL_NODE))  
+    slottable.add_node(Node(4, "test-4", FULL_NODE))  
+
+    lease1 = Lease(None,None,None,None,None,2,None,None)
+    lease1.id = 1
+    res1 = {1: FULL_NODE, 2: FULL_NODE}
+    rr1 = ResourceReservation(lease1, T1330, T1345, res1)
+    slottable.add_reservation(rr1)
+
+    lease2 = Lease(None,None,None,None,None,1,None,None)
+    lease2.id = 2
+    res2 = {1: HALF_NODE}
+    rr2 = ResourceReservation(lease1, T1315, T1330, res2)
+    slottable.add_reservation(rr2)
+
+    return slottable
+
+def sample_slottable_4():
+    slottable = SlotTable()
+
+    slottable.add_node(Node(1, "test-1", FULL_NODE))
+    slottable.add_node(Node(2, "test-2", FULL_NODE))  
+    slottable.add_node(Node(3, "test-3", FULL_NODE))  
+    slottable.add_node(Node(4, "test-4", FULL_NODE))  
+
+    lease1 = Lease(None,None,None,None,None,1,None,None)
+    lease1.id = 1
+    res1 = {1: FULL_NODE}
+    rr1 = ResourceReservation(lease1, T1345, T1415, res1)
+    slottable.add_reservation(rr1)
+
+    lease2 = Lease(None,None,None,None,None,1,None,None)
+    lease2.id = 2
+    res2 = {2: HALF_NODE}
+    rr2 = ResourceReservation(lease2, T1330, T1415, res2)
+    slottable.add_reservation(rr2)
+
+    lease3 = Lease(None,None,None,None,None,1,None,None)
+    lease3.id = 3
+    res3 = {2: HALF_NODE}
+    rr3 = ResourceReservation(lease3, T1400, T1415, res3)
+    slottable.add_reservation(rr3)
+
+    return slottable
\ No newline at end of file

Modified: branches/TP2.0/tests/test_slottable.py
===================================================================
--- branches/TP2.0/tests/test_slottable.py	2009-06-17 17:50:41 UTC (rev 590)
+++ branches/TP2.0/tests/test_slottable.py	2009-06-17 17:52:06 UTC (rev 591)
@@ -1,41 +1,10 @@
-from haizea.resourcemanager.leases import Lease
-from haizea.resourcemanager.scheduler.resourcepool import Node
-from haizea.resourcemanager.scheduler.slottable import ResourceTuple, SlotTable, ResourceReservation, AvailabilityWindow
+from haizea.core.leases import Lease
+from haizea.core.scheduler.resourcepool import Node
+from haizea.core.scheduler.slottable import ResourceTuple, SlotTable, ResourceReservation, AvailabilityWindow
 from mx import DateTime
+from sample_slottables import *
 import haizea.common.constants as constants
 
-T1255 = DateTime.DateTime(2006,11,25,12,55)
-T1300 = DateTime.DateTime(2006,11,25,13,00)
-T1305 = DateTime.DateTime(2006,11,25,13,05)
-T1315 = DateTime.DateTime(2006,11,25,13,15)
-T1325 = DateTime.DateTime(2006,11,25,13,25)
-T1330 = DateTime.DateTime(2006,11,25,13,30)
-T1335 = DateTime.DateTime(2006,11,25,13,35)
-T1345 = DateTime.DateTime(2006,11,25,13,45)
-T1350 = DateTime.DateTime(2006,11,25,13,50)
-T1355 = DateTime.DateTime(2006,11,25,13,55)
-T1400 = DateTime.DateTime(2006,11,25,14,00)
-T1415 = DateTime.DateTime(2006,11,25,14,15)
-T1420 = DateTime.DateTime(2006,11,25,14,20)
-
-resource_types = [(constants.RES_CPU, constants.RESTYPE_FLOAT, "CPU"),
-                  (constants.RES_MEM,  constants.RESTYPE_INT, "Mem")]
-ResourceTuple.set_resource_types(resource_types)
-
-FULL_NODE = ResourceTuple.create_empty()
-FULL_NODE.set_by_type(constants.RES_CPU, 1.0)
-FULL_NODE.set_by_type(constants.RES_MEM, 1024)
-
-HALF_NODE = ResourceTuple.create_empty()
-HALF_NODE.set_by_type(constants.RES_CPU, 0.5)
-HALF_NODE.set_by_type(constants.RES_MEM, 512)
-
-QRTR_NODE = ResourceTuple.create_empty()
-QRTR_NODE.set_by_type(constants.RES_CPU, 0.25)
-QRTR_NODE.set_by_type(constants.RES_MEM, 256)
-
-EMPT_NODE = ResourceTuple.create_empty()
-
 class TestSlotTable(object):
     def __init__(self):
         self.slottable = None
@@ -374,62 +343,18 @@
             if next_cp != None:
                 assert(node.next_nodeavail == aw.changepoints[next_cp].nodes[node_id])
         
-        self.slottable = SlotTable()
-
-        self.slottable.add_node(Node(1, "test-1", FULL_NODE))
-        self.slottable.add_node(Node(2, "test-2", FULL_NODE))  
-        self.slottable.add_node(Node(3, "test-3", FULL_NODE))  
-        self.slottable.add_node(Node(4, "test-4", FULL_NODE))  
-    
-        lease1 = Lease(None,None,None,None,None,1,None,None)
-        lease1.id = 1
-        res1 = {2: HALF_NODE}
-        rr1_1 = ResourceReservation(lease1, T1315, T1325, res1)
-        rr1_2 = ResourceReservation(lease1, T1325, T1330, res1)
-        self.slottable.add_reservation(rr1_1)
-        self.slottable.add_reservation(rr1_2)
-
-        lease2 = Lease(None,None,None,None,None,2,None,None)
-        lease2.id = 2
-        res2 = {2: FULL_NODE, 3: FULL_NODE}
-        rr2 = ResourceReservation(lease2, T1330, T1345, res2)
-        self.slottable.add_reservation(rr2)
-
-        lease3 = Lease(None,None,None,None,None,1,None,None)
-        lease3.id = 3
-        res3 = {4: FULL_NODE}
-        rr3_1 = ResourceReservation(lease3, T1330, T1355, res3)
-        rr3_2 = ResourceReservation(lease3, T1355, T1400, res3)
-        self.slottable.add_reservation(rr3_1)
-        self.slottable.add_reservation(rr3_2)
-
-        lease4 = Lease(None,None,None,None,None,1,None,None)
-        lease4.id = 4
-        res4 = {2: QRTR_NODE, 3: HALF_NODE}
-        rr4 = ResourceReservation(lease4, T1350, T1415, res4)
-        self.slottable.add_reservation(rr4)
-
-        lease5 = Lease(None,None,None,None,None,1,None,None)
-        lease5.id = 5
-        res5 = {2: QRTR_NODE}
-        rr5 = ResourceReservation(lease5, T1350, T1415, res5)
-        self.slottable.add_reservation(rr5)
+        self.slottable, leases = sample_slottable_1()        
         
-        lease6 = Lease(None,None,None,None,None,1,None,None)
-        lease6.id = 6
-        res6 = {1: FULL_NODE}
-        rr6 = ResourceReservation(lease6, T1255, T1305, res6)
-        self.slottable.add_reservation(rr6)        
+        lease1,lease2,lease3,lease4,lease5,lease6 = leases
         
-        aw = AvailabilityWindow(self.slottable, T1300)
+        aw = self.slottable.get_availability_window(T1300)
         
-        
         # TODO: Factor out data into a data structure so we can do more
         # elaborate assertions
         
         # 13:00
         avail_node_assertions(time = T1300, avail = EMPT_NODE, node_id = 1, 
-                              leases = {6:FULL_NODE}, next_cp = T1305)
+                              leases = {lease6:FULL_NODE}, next_cp = T1305)
         avail_node_assertions(time = T1300, avail = FULL_NODE, node_id = 2, 
                               leases = {}, next_cp = T1315)
         avail_node_assertions(time = T1300, avail = FULL_NODE, node_id = 3, 
@@ -452,7 +377,7 @@
         avail_node_assertions(time = T1315, avail = FULL_NODE, node_id = 1, 
                               leases = {}, next_cp = None)
         avail_node_assertions(time = T1315, avail = HALF_NODE, node_id = 2, 
-                              leases = {1:HALF_NODE}, next_cp = T1330)
+                              leases = {lease1:HALF_NODE}, next_cp = T1330)
         avail_node_assertions(time = T1315, avail = FULL_NODE, node_id = 3, 
                               leases = {}, next_cp = T1330)
         avail_node_assertions(time = T1315, avail = FULL_NODE, node_id = 4, 
@@ -462,7 +387,7 @@
         avail_node_assertions(time = T1325, avail = FULL_NODE, node_id = 1, 
                               leases = {}, next_cp = None)
         avail_node_assertions(time = T1325, avail = HALF_NODE, node_id = 2, 
-                              leases = {1:HALF_NODE}, next_cp = T1330)
+                              leases = {lease1:HALF_NODE}, next_cp = T1330)
         avail_node_assertions(time = T1325, avail = FULL_NODE, node_id = 3, 
                               leases = {}, next_cp = T1330)
         avail_node_assertions(time = T1325, avail = FULL_NODE, node_id = 4, 
@@ -472,11 +397,11 @@
         avail_node_assertions(time = T1330, avail = FULL_NODE, node_id = 1, 
                               leases = {}, next_cp = None)
         avail_node_assertions(time = T1330, avail = EMPT_NODE, node_id = 2, 
-                              leases = {2:FULL_NODE}, next_cp = T1345)
+                              leases = {lease2:FULL_NODE}, next_cp = T1345)
         avail_node_assertions(time = T1330, avail = EMPT_NODE, node_id = 3, 
-                              leases = {2:FULL_NODE}, next_cp = T1345)
+                              leases = {lease2:FULL_NODE}, next_cp = T1345)
         avail_node_assertions(time = T1330, avail = EMPT_NODE, node_id = 4, 
-                              leases = {3:FULL_NODE}, next_cp = T1400)
+                              leases = {lease3:FULL_NODE}, next_cp = T1400)
 
         # 13:45
         avail_node_assertions(time = T1345, avail = FULL_NODE, node_id = 1, 
@@ -486,35 +411,35 @@
         avail_node_assertions(time = T1345, avail = FULL_NODE, node_id = 3, 
                               leases = {}, next_cp = T1350)
         avail_node_assertions(time = T1345, avail = EMPT_NODE, node_id = 4, 
-                              leases = {3:FULL_NODE}, next_cp = T1400)
+                              leases = {lease3:FULL_NODE}, next_cp = T1400)
 
         # 13:50
         avail_node_assertions(time = T1350, avail = FULL_NODE, node_id = 1, 
                               leases = {}, next_cp = None)
         avail_node_assertions(time = T1350, avail = HALF_NODE, node_id = 2, 
-                              leases = {4:QRTR_NODE,5:QRTR_NODE}, next_cp = T1415)
+                              leases = {lease4:QRTR_NODE,lease5:QRTR_NODE}, next_cp = T1415)
         avail_node_assertions(time = T1350, avail = HALF_NODE, node_id = 3, 
-                              leases = {4:HALF_NODE}, next_cp = T1415)
+                              leases = {lease4:HALF_NODE}, next_cp = T1415)
         avail_node_assertions(time = T1350, avail = EMPT_NODE, node_id = 4, 
-                              leases = {3:FULL_NODE}, next_cp = T1400)
+                              leases = {lease3:FULL_NODE}, next_cp = T1400)
 
         # 13:55
         avail_node_assertions(time = T1355, avail = FULL_NODE, node_id = 1, 
                               leases = {}, next_cp = None)
         avail_node_assertions(time = T1355, avail = HALF_NODE, node_id = 2, 
-                              leases = {4:QRTR_NODE,5:QRTR_NODE}, next_cp = T1415)
+                              leases = {lease4:QRTR_NODE,lease5:QRTR_NODE}, next_cp = T1415)
         avail_node_assertions(time = T1355, avail = HALF_NODE, node_id = 3, 
-                              leases = {4:HALF_NODE}, next_cp = T1415)
+                              leases = {lease4:HALF_NODE}, next_cp = T1415)
         avail_node_assertions(time = T1355, avail = EMPT_NODE, node_id = 4, 
-                              leases = {3:FULL_NODE}, next_cp = T1400)
+                              leases = {lease3:FULL_NODE}, next_cp = T1400)
 
         # 14:00
         avail_node_assertions(time = T1400, avail = FULL_NODE, node_id = 1, 
                               leases = {}, next_cp = None)
         avail_node_assertions(time = T1400, avail = HALF_NODE, node_id = 2, 
-                              leases = {4:QRTR_NODE,5:QRTR_NODE}, next_cp = T1415)
+                              leases = {lease4:QRTR_NODE,lease5:QRTR_NODE}, next_cp = T1415)
         avail_node_assertions(time = T1400, avail = HALF_NODE, node_id = 3, 
-                              leases = {4:HALF_NODE}, next_cp = T1415)
+                              leases = {lease4:HALF_NODE}, next_cp = T1415)
         avail_node_assertions(time = T1400, avail = FULL_NODE, node_id = 4, 
                               leases = {}, next_cp = None)
 
@@ -529,75 +454,75 @@
                               leases = {}, next_cp = None)
         
         avail = aw.get_availability_at_node(T1300, 1)
-        assert(len(avail)==1)
-        assert(avail[0].available == EMPT_NODE)
-        assert(avail[0].until     == None)
+        assert(len(avail.avail_list)==1)
+        assert(avail.avail_list[0].available == EMPT_NODE)
+        assert(avail.avail_list[0].until     == None)
 
         avail = aw.get_availability_at_node(T1300, 2)
-        assert(len(avail)==3)
-        assert(avail[0].available == FULL_NODE)
-        assert(avail[0].until     == T1315)
-        assert(avail[1].available == HALF_NODE)
-        assert(avail[1].until     == T1330)
-        assert(avail[2].available == EMPT_NODE)
-        assert(avail[2].until     == None)
+        assert(len(avail.avail_list)==3)
+        assert(avail.avail_list[0].available == FULL_NODE)
+        assert(avail.avail_list[0].until     == T1315)
+        assert(avail.avail_list[1].available == HALF_NODE)
+        assert(avail.avail_list[1].until     == T1330)
+        assert(avail.avail_list[2].available == EMPT_NODE)
+        assert(avail.avail_list[2].until     == None)
 
         avail = aw.get_availability_at_node(T1300, 3)
-        assert(len(avail)==2)
-        assert(avail[0].available == FULL_NODE)
-        assert(avail[0].until     == T1330)
-        assert(avail[1].available == EMPT_NODE)
-        assert(avail[1].until     == None)
+        assert(len(avail.avail_list)==2)
+        assert(avail.avail_list[0].available == FULL_NODE)
+        assert(avail.avail_list[0].until     == T1330)
+        assert(avail.avail_list[1].available == EMPT_NODE)
+        assert(avail.avail_list[1].until     == None)
 
         avail = aw.get_availability_at_node(T1300, 4)
-        assert(len(avail)==2)
-        assert(avail[0].available == FULL_NODE)
-        assert(avail[0].until     == T1330)
-        assert(avail[1].available == EMPT_NODE)
-        assert(avail[1].until     == None)
+        assert(len(avail.avail_list)==2)
+        assert(avail.avail_list[0].available == FULL_NODE)
+        assert(avail.avail_list[0].until     == T1330)
+        assert(avail.avail_list[1].available == EMPT_NODE)
+        assert(avail.avail_list[1].until     == None)
 
 
         avail = aw.get_availability_at_node(T1330, 1)
-        assert(len(avail)==1)
-        assert(avail[0].available == FULL_NODE)
-        assert(avail[0].until     == None)
+        assert(len(avail.avail_list)==1)
+        assert(avail.avail_list[0].available == FULL_NODE)
+        assert(avail.avail_list[0].until     == None)
 
         avail = aw.get_availability_at_node(T1330, 2)
-        assert(len(avail)==1)
-        assert(avail[0].available == EMPT_NODE)
-        assert(avail[0].until     == None)
+        assert(len(avail.avail_list)==1)
+        assert(avail.avail_list[0].available == EMPT_NODE)
+        assert(avail.avail_list[0].until     == None)
 
         avail = aw.get_availability_at_node(T1330, 3)
-        assert(len(avail)==1)
-        assert(avail[0].available == EMPT_NODE)
-        assert(avail[0].until     == None)
+        assert(len(avail.avail_list)==1)
+        assert(avail.avail_list[0].available == EMPT_NODE)
+        assert(avail.avail_list[0].until     == None)
 
         avail = aw.get_availability_at_node(T1330, 4)
-        assert(len(avail)==1)
-        assert(avail[0].available == EMPT_NODE)
-        assert(avail[0].until     == None)
+        assert(len(avail.avail_list)==1)
+        assert(avail.avail_list[0].available == EMPT_NODE)
+        assert(avail.avail_list[0].until     == None)
         
         
         avail = aw.get_availability_at_node(T1345, 1)
-        assert(len(avail)==1)
-        assert(avail[0].available == FULL_NODE)
-        assert(avail[0].until     == None)
+        assert(len(avail.avail_list)==1)
+        assert(avail.avail_list[0].available == FULL_NODE)
+        assert(avail.avail_list[0].until     == None)
 
         avail = aw.get_availability_at_node(T1345, 2)
-        assert(len(avail)==2)
-        assert(avail[0].available == FULL_NODE)
-        assert(avail[0].until     == T1350)
-        assert(avail[1].available == HALF_NODE)
-        assert(avail[1].until     == None)
+        assert(len(avail.avail_list)==2)
+        assert(avail.avail_list[0].available == FULL_NODE)
+        assert(avail.avail_list[0].until     == T1350)
+        assert(avail.avail_list[1].available == HALF_NODE)
+        assert(avail.avail_list[1].until     == None)
 
         avail = aw.get_availability_at_node(T1345, 3)
-        assert(len(avail)==2)
-        assert(avail[0].available == FULL_NODE)
-        assert(avail[0].until     == T1350)
-        assert(avail[1].available == HALF_NODE)
-        assert(avail[1].until     == None)
+        assert(len(avail.avail_list)==2)
+        assert(avail.avail_list[0].available == FULL_NODE)
+        assert(avail.avail_list[0].until     == T1350)
+        assert(avail.avail_list[1].available == HALF_NODE)
+        assert(avail.avail_list[1].until     == None)
 
         avail = aw.get_availability_at_node(T1345, 4)
-        assert(len(avail)==1)
-        assert(avail[0].available == EMPT_NODE)
-        assert(avail[0].until     == None)        
+        assert(len(avail.avail_list)==1)
+        assert(avail.avail_list[0].available == EMPT_NODE)
+        assert(avail.avail_list[0].until     == None)        



More information about the Haizea-commit mailing list