Fix group_id check.

Author: Josh Bailey

clib/mininet_test_base.py

@@ -750,21 +750,16 @@ def get_matching_flow(self, match, timeout=10, table_id=None,
             cookie=cookie)
 
     def get_group_id_for_matching_flow(self, match, timeout=10, table_id=None):
-        group_id = None
         for _ in range(timeout):
             flow_dict = self.get_matching_flow(
                 match, timeout=timeout, table_id=table_id)
             if flow_dict:
                 for action in flow_dict['actions']:
                     if action.startswith('GROUP'):
                         _, group_id = action.split(':')
-                        group_id = int(group_id)
-                        break
+                        return int(group_id)
             time.sleep(1)
-        self.assertTrue(
-            group_id,
-            msg='Cannot find group_id for matching flow %s' % match)
-        return group_id
+        return None
 
     def matching_flow_present_on_dpid(self, dpid, match, timeout=10, table_id=None,
                                       actions=None, match_exact=None, hard_timeout=0,
@@ -1941,6 +1936,7 @@ def wait_for_route_as_flow(self, nexthop, prefix, vlan_vid=None, timeout=10,
         if with_group_table:
             group_id = self.get_group_id_for_matching_flow(
                 nw_dst_match)
+            self.assertTrue(group_id)
             self.wait_matching_in_group_table(
                 nexthop_action, group_id, timeout)
         else:

tests/faucet_mininet_test_unit.py

@@ -5503,9 +5503,6 @@ class FaucetGroupTableUntaggedIPv4RouteTest(FaucetUntaggedTest):
             - route:
                 ip_dst: "10.0.2.0/24"
                 ip_gw: "10.0.0.2"
-            - route:
-                ip_dst: "10.0.3.0/24"
-                ip_gw: "10.0.0.2"
 """
     CONFIG = """
         arp_neighbor_timeout: 2
@@ -5539,7 +5536,6 @@ def test_untagged(self):
             self.swap_host_macs(first_host, second_host)
 
 
-@unittest.skip('group table routing unreliable')
 class FaucetGroupTableUntaggedIPv6RouteTest(FaucetUntaggedTest):
 
     CONFIG_GLOBAL = """
@@ -5554,9 +5550,6 @@ class FaucetGroupTableUntaggedIPv6RouteTest(FaucetUntaggedTest):
             - route:
                 ip_dst: "fc00::20:0/112"
                 ip_gw: "fc00::1:2"
-            - route:
-                ip_dst: "fc00::30:0/112"
-                ip_gw: "fc00::1:2"
 """
 
     CONFIG = """