Skip to content

Commit

Permalink
Merge pull request #54 from ajragusa/master
Browse files Browse the repository at this point in the history 
fixing a unit test
  • Loading branch information
@ajragusa
ajragusa committed Jul 21, 2015
2 parents 9916d66 + 0086193 commit 1e46c24
Showing 1 changed file with 44 additions and 74 deletions.
118 changes: 44 additions & 74 deletions python/t/BalancerOnlyTest.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import os
from SciPass import SciPass
import libxml2
import time
import xmlrunner


Expand Down Expand Up @@ -147,83 +148,60 @@ def flowSent(dpid = None, header = None, actions = None,command = None, priority
#without network traffic there is nothing to balance!
self.assertTrue( len(flows) == 0)



self.api.updatePrefixBW("0000000000000001", ipaddr.IPv4Network("129.79.0.0/16"), 2000000000, 0)
self.api.updatePrefixBW("0000000000000001", ipaddr.IPv4Network("134.68.0.0/16"), 8000000000, 0)
self.api.updatePrefixBW("0000000000000001", ipaddr.IPv4Network("140.182.0.0/16"), 500000000, 0)
self.api.updatePrefixBW("0000000000000001", ipaddr.IPv4Network("149.159.0.0/16"), 80000000, 0)
self.api.run_balancers()

self.assertTrue( len(flows) == 12)
self.assertTrue( len(flows) == 8)
exit
flow = flows[0]
self.assertEquals(flow['actions'],[])
self.assertEquals(flow['command'],"DELETE_STRICT")
self.assertEquals(flow['header'], {'phys_port': 10, 'nw_src': 2252603392, 'nw_src_mask': 16})
self.assertEquals(flow['priority'], 26800)
self.assertEquals(flow['header'], {'phys_port': 10, 'nw_src': 167837696, 'nw_src_mask': 16})
self.assertEquals(flow['priority'], 600)
flow = flows[1]
self.assertEquals(flow['actions'],[])
self.assertEquals(flow['command'],"DELETE_STRICT")
self.assertEquals(flow['header'], {'nw_dst_mask': 16, 'phys_port': 10, 'nw_dst': 2252603392})
self.assertEquals(flow['priority'], 26800)
self.assertEquals(flow['header'], {'nw_dst_mask': 16, 'phys_port': 10, 'nw_dst': 167837696})
self.assertEquals(flow['priority'], 600)
flow = flows[2]
self.assertEquals(flow['actions'],[])
self.assertEquals(flow['command'],"DELETE_STRICT")
self.assertEquals(flow['header'], {'phys_port': 9, 'nw_src': 2252603392, 'nw_src_mask': 16})
self.assertEquals(flow['priority'], 26800)
self.assertEquals(flow['header'], {'phys_port': 9, 'nw_src': 167837696, 'nw_src_mask': 16})
self.assertEquals(flow['priority'], 600)
flow = flows[3]
self.assertEquals(flow['actions'],[])
self.assertEquals(flow['command'],"DELETE_STRICT")
self.assertEquals(flow['header'], {'nw_dst_mask': 16, 'phys_port': 9, 'nw_dst': 2252603392})
self.assertEquals(flow['priority'], 26800)
self.assertEquals(flow['header'], {'nw_dst_mask': 16, 'phys_port': 9, 'nw_dst': 167837696})
self.assertEquals(flow['priority'], 600)
flow = flows[4]
self.assertEquals(flow['actions'],[{'type': 'output', 'port': '4'}, {'type': 'output', 'port': '3'}])
self.assertEquals(flow['command'],"ADD")
self.assertEquals(flow['header'], {'phys_port': 10, 'nw_src': 2252603392, 'nw_src_mask': 17})
self.assertEquals(flow['priority'], 26800)
self.assertEquals(flow['header'], {'phys_port': 10, 'nw_src': 167837696, 'nw_src_mask': 16})
self.assertEquals(flow['priority'], 600)
flow = flows[5]
self.assertEquals(flow['actions'],[{'type': 'output', 'port': 4}, {'type': 'output', 'port': 3}])
self.assertEquals(flow['command'],"ADD")
self.assertEquals(flow['header'], {'nw_dst_mask': 17, 'phys_port': 10, 'nw_dst': 2252603392})
self.assertEquals(flow['priority'], 26800)
self.assertEquals(flow['header'], {'nw_dst_mask': 16, 'phys_port': 10, 'nw_dst': 167837696})
self.assertEquals(flow['priority'], 600)
flow = flows[6]
self.assertEquals(flow['actions'], [{'type': 'output', 'port': '4'}, {'type': 'output', 'port': '3'}])
self.assertEquals(flow['command'],"ADD")
self.assertEquals(flow['header'], {'phys_port': 9, 'nw_src': 2252603392, 'nw_src_mask': 17})
self.assertEquals(flow['priority'], 26800)
self.assertEquals(flow['header'], {'phys_port': 9, 'nw_src': 167837696, 'nw_src_mask': 16})
self.assertEquals(flow['priority'], 600)
flow = flows[7]
self.assertEquals(flow['actions'],[{'type': 'output', 'port': 4}, {'type': 'output', 'port': 3}])
self.assertEquals(flow['command'],"ADD")
self.assertEquals(flow['header'], {'nw_dst_mask': 17, 'phys_port': 9, 'nw_dst': 2252603392})
self.assertEquals(flow['priority'], 26800)
flow = flows[8]
self.assertEquals(flow['actions'],[{'type': 'output', 'port': '4'}, {'type': 'output', 'port': '3'}])
self.assertEquals(flow['command'],"ADD")
self.assertEquals(flow['header'], {'phys_port': 10, 'nw_src': 2252636160, 'nw_src_mask': 17})
self.assertEquals(flow['priority'], 26850)
flow = flows[9]
self.assertEquals(flow['actions'],[{'type': 'output', 'port': 4}, {'type': 'output', 'port': 3}])
self.assertEquals(flow['command'],"ADD")
self.assertEquals(flow['header'], {'nw_dst_mask': 17, 'phys_port': 10, 'nw_dst': 2252636160})
self.assertEquals(flow['priority'], 26850)
flow = flows[10]
self.assertEquals(flow['actions'],[{'type': 'output', 'port': '4'}, {'type': 'output', 'port': '3'}])
self.assertEquals(flow['command'],"ADD")
self.assertEquals(flow['header'], {'phys_port': 9, 'nw_src': 2252636160, 'nw_src_mask': 17})
self.assertEquals(flow['priority'], 26850)
flow = flows[11]
self.assertEquals(flow['actions'],[{'type': 'output', 'port': 4}, {'type': 'output', 'port': 3}])
self.assertEquals(flow['command'],"ADD")
self.assertEquals(flow['header'], {'nw_dst_mask': 17, 'phys_port': 9, 'nw_dst': 2252636160})
self.assertEquals(flow['priority'], 26850)

self.assertEquals(flow['header'], {'nw_dst_mask': 16, 'phys_port': 9, 'nw_dst': 167837696})
self.assertEquals(flow['priority'], 600)

#run the balancer again!
flows = []
self.api.run_balancers()
print "\n FLOWS AFTER BALANCE: %d \n" % len(flows)
self.assertTrue(len(flows) == 12)

self.assertTrue(len(flows) == 8)
#run the balancer again!
flows = []
self.api.run_balancers()
Expand All @@ -233,43 +211,43 @@ def flowSent(dpid = None, header = None, actions = None,command = None, priority
flow = flows[0]
self.assertEquals(flow['actions'],[])
self.assertEquals(flow['command'],"DELETE_STRICT")
self.assertEquals(flow['header'], {'phys_port': 10, 'nw_src': 2252603392, 'nw_src_mask': 18})
self.assertEquals(flow['priority'], 26800)
self.assertEquals(flow['header'], {'phys_port': 10, 'nw_src': 168099840, 'nw_src_mask': 16})
self.assertEquals(flow['priority'], 1000)
flow = flows[1]
self.assertEquals(flow['actions'],[])
self.assertEquals(flow['command'],"DELETE_STRICT")
self.assertEquals(flow['header'], {'nw_dst_mask': 18, 'phys_port': 10, 'nw_dst': 2252603392})
self.assertEquals(flow['priority'], 26800)
self.assertEquals(flow['header'], {'nw_dst_mask': 16, 'phys_port': 10, 'nw_dst': 168099840})
self.assertEquals(flow['priority'], 1000)
flow = flows[2]
self.assertEquals(flow['actions'],[])
self.assertEquals(flow['command'],"DELETE_STRICT")
self.assertEquals(flow['header'], {'phys_port': 9, 'nw_src': 2252603392, 'nw_src_mask': 18})
self.assertEquals(flow['priority'], 26800)
self.assertEquals(flow['header'], {'phys_port': 9, 'nw_src': 168099840, 'nw_src_mask': 16})
self.assertEquals(flow['priority'], 1000)
flow = flows[3]
self.assertEquals(flow['actions'],[])
self.assertEquals(flow['command'],"DELETE_STRICT")
self.assertEquals(flow['header'], {'nw_dst_mask': 18, 'phys_port': 9, 'nw_dst': 2252603392})
self.assertEquals(flow['priority'], 26800)
self.assertEquals(flow['header'], {'nw_dst_mask': 16, 'phys_port': 9, 'nw_dst': 168099840})
self.assertEquals(flow['priority'], 1000)
flow = flows[4]
self.assertEquals(flow['actions'],[{'type': 'output', 'port': '1'}, {'type': 'output', 'port': '2'}])
self.assertEquals(flow['actions'],[{'type': 'output', 'port': '4'}, {'type': 'output', 'port': '3'}])
self.assertEquals(flow['command'],"ADD")
self.assertEquals(flow['header'], {'phys_port': 10, 'nw_src': 2252603392, 'nw_src_mask': 18})
self.assertEquals(flow['priority'], 26800)
self.assertEquals(flow['header'], {'phys_port': 10, 'nw_src': 168099840, 'nw_src_mask': 16})
self.assertEquals(flow['priority'], 1000)
flow = flows[5]
self.assertEquals(flow['actions'],[{'type': 'output', 'port': 1}, {'type': 'output', 'port': 2}])
self.assertEquals(flow['actions'],[{'type': 'output', 'port': 4}, {'type': 'output', 'port': 3}])
self.assertEquals(flow['command'],"ADD")
self.assertEquals(flow['header'], {'nw_dst_mask': 18, 'phys_port': 10, 'nw_dst': 2252603392})
self.assertEquals(flow['priority'], 26800)
self.assertEquals(flow['header'], {'nw_dst_mask': 16, 'phys_port': 10, 'nw_dst': 168099840})
self.assertEquals(flow['priority'], 1000)
flow = flows[6]
self.assertEquals(flow['actions'],[{'type': 'output', 'port': '1'}, {'type': 'output', 'port': '2'}])
self.assertEquals(flow['actions'],[{'type': 'output', 'port': '4'}, {'type': 'output', 'port': '3'}])
self.assertEquals(flow['command'],"ADD")
self.assertEquals(flow['header'], {'phys_port': 9, 'nw_src': 2252603392, 'nw_src_mask': 18})
self.assertEquals(flow['priority'], 26800)
self.assertEquals(flow['header'], {'phys_port': 9, 'nw_src': 168099840, 'nw_src_mask': 16})
self.assertEquals(flow['priority'], 1000)
flow = flows[7]
self.assertEquals(flow['actions'],[{'type': 'output', 'port': 1}, {'type': 'output', 'port': 2}])
self.assertEquals(flow['actions'],[{'type': 'output', 'port': 4}, {'type': 'output', 'port': 3}])
self.assertEquals(flow['command'],"ADD")
self.assertEquals(flow['header'], {'nw_dst_mask': 18, 'phys_port': 9, 'nw_dst': 2252603392})
self.assertEquals(flow['priority'], 26800)
self.assertEquals(flow['header'], {'nw_dst_mask': 16, 'phys_port': 9, 'nw_dst': 168099840})
self.assertEquals(flow['priority'], 1000)

#run the balancer again!
flows = []
Expand All @@ -281,25 +259,19 @@ def flowSent(dpid = None, header = None, actions = None,command = None, priority
flows = []
self.api.run_balancers()
print "\n FLOWS AFTER BALANCE: %d \n" % len(flows)
self.assertTrue(len(flows) == 12)

#run the balancer again!
flows = []
self.api.run_balancers()
print "\n FLOWS AFTER BALANCE: %d \n" % len(flows)
self.assertTrue(len(flows) == 12)
self.assertTrue(len(flows) == 8)

#run the balancer again!
flows = []
self.api.run_balancers()
print "\n FLOWS AFTER BALANCE: %d \n" % len(flows)
self.assertTrue(len(flows) == 12)
self.assertTrue(len(flows) == 8)

#run the balancer again!
flows = []
self.api.run_balancers()
print "\n FLOWS AFTER BALANCE: %d \n" % len(flows)
self.assertTrue(len(flows) == 12)
self.assertTrue(len(flows) == 8)

#run the balancer again!
flows = []
Expand All @@ -317,9 +289,7 @@ def flowSent(dpid = None, header = None, actions = None,command = None, priority
flows = []
self.api.run_balancers()
print "\n FLOWS AFTER BALANCE: %d \n" % len(flows)
self.assertTrue(len(flows) == 0)

#ok its balananced!!!!
self.assertTrue(len(flows) == 8)

def suite():
suite = unittest.TestLoader().loadTestsFromTestCase(BalancerInitTest)
Expand Down

0 comments on commit 1e46c24

Please sign in to comment.