consistent naming convention for forwarding policies between bucket and path_query

Author: ngsrinivas

pyretic/examples/bucket.py

@@ -49,24 +49,21 @@
 ip2 = IPAddr('10.0.0.2')
 ip3 = IPAddr('10.0.0.3')
 
-fwding_single_3 = ( (match(dstip=ip1) >> fwd(1)) +
-                    (match(dstip=ip2) >> fwd(2)) +
-                    (match(dstip=ip3) >> fwd(3)) )
-fwding_cycle_3_3 = ( (match(dstip=ip1) >> match(switch=1) >> fwd(3)) +
-                     (match(dstip=ip1) >> match(switch=2) >> fwd(1)) +
-                     (match(dstip=ip1) >> match(switch=3) >> fwd(2)) +
-                     (match(dstip=ip2) >> match(switch=1) >> fwd(1)) +
-                     (match(dstip=ip2) >> match(switch=2) >> fwd(3)) +
-                     (match(dstip=ip2) >> match(switch=3) >> fwd(2)) +
-                     (match(dstip=ip3) >> match(switch=1) >> fwd(2)) +
-                     (match(dstip=ip3) >> match(switch=2) >> fwd(1)) +
-                     (match(dstip=ip3) >> match(switch=3) >> fwd(3)) )
-
-def static_fwding_single():
-    return fwding_single_3
-
-def static_fwding_cycle():
-    return fwding_cycle_3_3
+def static_fwding_single_3():
+    return ( (match(dstip=ip1) >> fwd(1)) +
+             (match(dstip=ip2) >> fwd(2)) +
+             (match(dstip=ip3) >> fwd(3)) )
+
+def static_fwding_cycle_3_3():
+    return ( (match(dstip=ip1) >> match(switch=1) >> fwd(3)) +
+             (match(dstip=ip1) >> match(switch=2) >> fwd(1)) +
+             (match(dstip=ip1) >> match(switch=3) >> fwd(2)) +
+             (match(dstip=ip2) >> match(switch=1) >> fwd(1)) +
+             (match(dstip=ip2) >> match(switch=2) >> fwd(3)) +
+             (match(dstip=ip2) >> match(switch=3) >> fwd(2)) +
+             (match(dstip=ip3) >> match(switch=1) >> fwd(2)) +
+             (match(dstip=ip3) >> match(switch=2) >> fwd(1)) +
+             (match(dstip=ip3) >> match(switch=3) >> fwd(3)) )
 
 class QueryTest(CountBucket):
 

pyretic/tests/all_bucket_tests.py

@@ -89,13 +89,13 @@ def generic_topo_tests(topo_name, topo_args, fwding_pols):
 def single_switch_topo_tests():
     topo_name   = 'SingleSwitchTopo'
     topo_args   = '3'
-    fwding_pols = ['static_fwding_single', 'mac_learner']
+    fwding_pols = ['static_fwding_single_3', 'mac_learner']
     generic_topo_tests(topo_name, topo_args, fwding_pols)
 
 def cycle_topo_tests():
     topo_name = 'CycleTopo'
     topo_args = '3,3'
-    fwding_pols = ['static_fwding_cycle', 'mac_learner']
+    fwding_pols = ['static_fwding_cycle_3_3', 'mac_learner']
     generic_topo_tests(topo_name, topo_args, fwding_pols)
 
 def print_failed_tests():