Merge pull request #526 from SpiNNakerManchester/roc_part

name optional parameters now required.

unittests/model_tests/routing_table_tests/test_routing_tables_model.py

@@ -44,7 +44,9 @@ def test_new_multicast_routing_table_entry(self):
         mask = 0xff00
         proc_ids = range(18)
         link_ids = range(6)
-        MulticastRoutingEntry(key_combo, mask, proc_ids, link_ids, True)
+        MulticastRoutingEntry(key_combo, mask,
+                              processor_ids=proc_ids, link_ids=link_ids,
+                              defaultable=True)
 
     def test_new_multicast_routing_table(self):
         """
@@ -61,9 +63,9 @@ def test_new_multicast_routing_table(self):
             link_ids.append(i)
         multicast_entries = list()
         for i in range(5):
-            multicast_entries.append(
-                MulticastRoutingEntry(key_combo + i, mask + i, proc_ids,
-                                      link_ids, True))
+            multicast_entries.append(MulticastRoutingEntry(
+                key_combo + i, mask + i,
+                processor_ids=proc_ids, link_ids=link_ids, defaultable=True))
         mrt = UnCompressedMulticastRoutingTable(0, 0, multicast_entries)
         self.assertEqual(mrt.x, 0)
         self.assertEqual(mrt.y, 0)
@@ -94,12 +96,14 @@ def test_new_multicast_routing_table_duplicate_entry(self):
         multicast_entries = list()
         for i in range(5):
             multicast_entries.append(MulticastRoutingEntry(
-                key_combo + i, mask + i, proc_ids, link_ids, True))
+                key_combo + i, mask + i, processor_ids=proc_ids,
+                link_ids=link_ids, defaultable=True))
         mrt = UnCompressedMulticastRoutingTable(0, 0, multicast_entries)
         # We can't add an entry with the same key but different route
         with self.assertRaises(PacmanAlreadyExistsException):
-            mrt.add_multicast_routing_entry(
-                MulticastRoutingEntry(key_combo, mask, [], link_ids, True))
+            mrt.add_multicast_routing_entry(MulticastRoutingEntry(
+                key_combo, mask, processor_ids=[], link_ids=link_ids,
+                defaultable=True))
 
     def test_new_multicast_routing_table_duplicate_key_combo(self):
 
@@ -114,7 +118,8 @@ def test_new_multicast_routing_table_duplicate_key_combo(self):
         multicast_entries = list()
         for i in range(5):
             multicast_entries.append(MulticastRoutingEntry(
-                key_combo, mask, proc_ids, link_ids, True))
+                key_combo, mask, processor_ids=proc_ids, link_ids=link_ids,
+                defaultable=True))
         # We can add entries that are exactly the same
         UnCompressedMulticastRoutingTable(0, 0, multicast_entries)
 
@@ -128,9 +133,11 @@ def test_new_multicast_routing_tables(self):
         for i in range(6):
             link_ids.append(i)
         multicast_entries1 = MulticastRoutingEntry(
-            key_combo, mask, proc_ids, link_ids, True)
+            key_combo, mask, processor_ids=proc_ids, link_ids=link_ids,
+            defaultable=True)
         multicast_entries2 = MulticastRoutingEntry(
-            key_combo - 1, mask - 1, proc_ids, link_ids, True)
+            key_combo - 1, mask - 1, processor_ids=proc_ids, link_ids=link_ids,
+            defaultable=True)
         mrt = list()
 
         t1 = UnCompressedMulticastRoutingTable(0, 0, [multicast_entries1])
@@ -167,10 +174,12 @@ def test_add_routing_table_for_duplicate_chip(self):
         for i in range(6):
             link_ids.append(i)
         multicast_entries1 = MulticastRoutingEntry(
-            key_combo, mask, proc_ids, link_ids, True)
+            key_combo, mask, processor_ids=proc_ids, link_ids=link_ids,
+            defaultable=True)
 
         multicast_entries2 = MulticastRoutingEntry(
-            key_combo - 1, mask, proc_ids, link_ids, True)
+            key_combo - 1, mask, processor_ids=proc_ids, link_ids=link_ids,
+            defaultable=True)
         mrt = list()
         mrt.append(
             UnCompressedMulticastRoutingTable(3, 0, [multicast_entries1]))

unittests/operations_tests/router_compressor_tests/test_compressors.py

@@ -34,21 +34,37 @@ def setUp(self):
         original_tables = MulticastRoutingTables()
         original_table = UnCompressedMulticastRoutingTable(x=0, y=0)
         original_table.add_multicast_routing_entry(
-            MulticastRoutingEntry(0b0000, 0b1111, [1, 2], [], False))
+            MulticastRoutingEntry(
+                0b0000, 0b1111,
+                processor_ids=[1, 2], link_ids=[], defaultable=False))
         original_table.add_multicast_routing_entry(
-            MulticastRoutingEntry(0b0001, 0b1111, [0], [], False))
+            MulticastRoutingEntry(
+                0b0001, 0b1111,
+                processor_ids=[0], link_ids=[], defaultable=False))
         original_table.add_multicast_routing_entry(
-            MulticastRoutingEntry(0b0101, 0b1111, [4], [], False))
+            MulticastRoutingEntry(
+                0b0101, 0b1111,
+                processor_ids=[4], link_ids=[], defaultable=False))
         original_table.add_multicast_routing_entry(
-            MulticastRoutingEntry(0b1000, 0b1111, [1, 2], [], False))
+            MulticastRoutingEntry(
+                0b1000, 0b1111,
+                processor_ids=[1, 2], link_ids=[], defaultable=False))
         original_table.add_multicast_routing_entry(
-            MulticastRoutingEntry(0b1001, 0b1111, [0], [], False))
+            MulticastRoutingEntry(
+                0b1001, 0b1111,
+                processor_ids=[0], link_ids=[], defaultable=False))
         original_table.add_multicast_routing_entry(
-            MulticastRoutingEntry(0b1110, 0b1111, [4], [], False))
+            MulticastRoutingEntry(
+                0b1110, 0b1111,
+                processor_ids=[4], link_ids=[], defaultable=False))
         original_table.add_multicast_routing_entry(
-            MulticastRoutingEntry(0b1100, 0b1111, [1, 2], [], False))
+            MulticastRoutingEntry(
+                0b1100, 0b1111,
+                processor_ids=[1, 2], link_ids=[], defaultable=False))
         original_table.add_multicast_routing_entry(
-            MulticastRoutingEntry(0b0010, 0b1011, [4, 5], [], False))
+            MulticastRoutingEntry(
+                0b0010, 0b1011,
+                processor_ids=[4, 5], link_ids=[], defaultable=False))
         original_tables.add_routing_table(original_table)
         unittest_setup()
         set_config(