Merge pull request #1998 from anarkiwi/master

 Test IPv6 VIPs are inconsistent, fix group_id check.

Author: anarkiwi

clib/mininet_test_base.py

@@ -47,8 +47,8 @@ class FaucetTestBase(unittest.TestCase):
     ONE_GOOD_PING = '1 packets transmitted, 1 received, 0% packet loss'
     FAUCET_VIPV4 = ipaddress.ip_interface(u'10.0.0.254/24')
     FAUCET_VIPV4_2 = ipaddress.ip_interface(u'172.16.0.254/24')
-    FAUCET_VIPV6 = ipaddress.ip_interface(u'fc00::1:254/64')
-    FAUCET_VIPV6_2 = ipaddress.ip_interface(u'fc01::1:254/64')
+    FAUCET_VIPV6 = ipaddress.ip_interface(u'fc00::1:254/112')
+    FAUCET_VIPV6_2 = ipaddress.ip_interface(u'fc01::1:254/112')
     OFCTL = 'ovs-ofctl -OOpenFlow13'
     VSCTL = 'ovs-vsctl'
     OVS_TYPE = 'kernel'
@@ -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

@@ -4327,10 +4327,10 @@ class FaucetUntaggedIPv6InterVLANRouteTest(FaucetUntaggedTest):
     CONFIG_GLOBAL = """
 vlans:
     100:
-        faucet_vips: ["fc00::1:254/64"]
+        faucet_vips: ["fc00::1:254/112"]
     vlanb:
         vid: 200
-        faucet_vips: ["fc01::1:254/64"]
+        faucet_vips: ["fc01::1:254/112"]
         faucet_mac: "%s"
     vlanc:
         vid: 100
@@ -4523,7 +4523,7 @@ class FaucetUntaggedMixedIPv6RouteTest(FaucetUntaggedTest):
 vlans:
     100:
         description: "untagged"
-        faucet_vips: ["fc00::1:254/64", "fc01::1:254/64"]
+        faucet_vips: ["fc00::1:254/112", "fc01::1:254/112"]
 """
 
     CONFIG = """
@@ -5488,6 +5488,7 @@ def test_group_exist(self):
                 {u'dl_vlan': u'100', u'dl_dst': u'ff:ff:ff:ff:ff:ff'},
                 table_id=self._FLOOD_TABLE))
 
+
 class FaucetGroupTableUntaggedIPv4RouteTest(FaucetUntaggedTest):
 
     CONFIG_GLOBAL = """
@@ -5502,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
@@ -5530,18 +5528,14 @@ def test_untagged(self):
         first_host, second_host = host_pair
         first_host_routed_ip = ipaddress.ip_interface(u'10.0.1.1/24')
         second_host_routed_ip = ipaddress.ip_interface(u'10.0.2.1/24')
-        self.verify_ipv4_routing(
-            first_host, first_host_routed_ip,
-            second_host, second_host_routed_ip,
-            with_group_table=True)
-        self.swap_host_macs(first_host, second_host)
-        self.verify_ipv4_routing(
-            first_host, first_host_routed_ip,
-            second_host, second_host_routed_ip,
-            with_group_table=True)
+        for _ in range(2):
+            self.verify_ipv4_routing(
+                first_host, first_host_routed_ip,
+                second_host, second_host_routed_ip,
+                with_group_table=True)
+            self.swap_host_macs(first_host, second_host)
 
 
-@unittest.skip('group table routing unreliable')
 class FaucetGroupTableUntaggedIPv6RouteTest(FaucetUntaggedTest):
 
     CONFIG_GLOBAL = """
@@ -5556,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 = """
@@ -5587,15 +5578,12 @@ def test_untagged(self):
         second_host_ip = ipaddress.ip_interface(u'fc00::1:2/112')
         first_host_routed_ip = ipaddress.ip_interface(u'fc00::10:1/112')
         second_host_routed_ip = ipaddress.ip_interface(u'fc00::20:1/112')
-        self.verify_ipv6_routing_pair(
-            first_host, first_host_ip, first_host_routed_ip,
-            second_host, second_host_ip, second_host_routed_ip,
-            with_group_table=True)
-        self.swap_host_macs(first_host, second_host)
-        self.verify_ipv6_routing_pair(
-            first_host, first_host_ip, first_host_routed_ip,
-            second_host, second_host_ip, second_host_routed_ip,
-            with_group_table=True)
+        for _ in range(2):
+            self.verify_ipv6_routing_pair(
+                first_host, first_host_ip, first_host_routed_ip,
+                second_host, second_host_ip, second_host_routed_ip,
+                with_group_table=True)
+            self.swap_host_macs(first_host, second_host)
 
 
 class FaucetEthSrcMaskTest(FaucetUntaggedTest):