Merge pull request #2290 from anarkiwi/master

Stricter checks in proactive learning.

Author: anarkiwi

README.rst

@@ -1,7 +1,7 @@
 Faucet
 ======
 
-:version: 1.8.13
+:version: 1.8.14
 
 .. image:: https://travis-ci.com/faucetsdn/faucet.svg?branch=master
     :target: https://travis-ci.com/faucetsdn/faucet

faucet/valve_route.py

@@ -204,6 +204,8 @@ def _add_faucet_fib_to_vip(self, vlan, priority, faucet_vip, faucet_vip_host):
             priority=self.route_priority,
             inst=insts))
         routed_vlans = self._routed_vlans(vlan)
+        if self._global_routing():
+            vlan = self.global_vlan
         ofmsgs.append(self.fib_table.flowmod(
             self._route_match(vlan, faucet_vip_host),
             priority=priority,
@@ -401,17 +403,18 @@ def _resolve_gateway_flows(self, ip_gw, nexthop_cache_entry, vlan, faucet_vip, n
             if last_retry_time is None and nexthop_cache_entry.port is not None:
                 resolve_flows = [self.resolve_gw_on_port(
                     vlan, nexthop_cache_entry.port, faucet_vip, ip_gw)]
-        if last_retry_time is None:
-            self.logger.info(
-                'resolving %s (%u flows) on VLAN %u' % (ip_gw, len(resolve_flows), vlan.vid))
-        else:
-            self.logger.info(
-                'resolving %s retry %u (last attempt was %us ago; %u flows) on VLAN %u' % (
-                    ip_gw,
-                    nexthop_cache_entry.resolve_retries,
-                    now - last_retry_time,
-                    len(resolve_flows),
-                    vlan.vid))
+        if resolve_flows:
+            if last_retry_time is None:
+                self.logger.info(
+                    'resolving %s (%u flows) on VLAN %u' % (ip_gw, len(resolve_flows), vlan.vid))
+            else:
+                self.logger.info(
+                    'resolving %s retry %u (last attempt was %us ago; %u flows) on VLAN %u' % (
+                        ip_gw,
+                        nexthop_cache_entry.resolve_retries,
+                         now - last_retry_time,
+                        len(resolve_flows),
+                        vlan.vid))
         return resolve_flows
 
     def _expire_gateway_flows(self, ip_gw, nexthop_cache_entry, vlan, now):
@@ -490,7 +493,7 @@ def _proactive_resolve_neighbor(self, now, vlan, dst_ip):
                 faucet_vip = vlan.vip_map(dst_ip)
             else:
                 vlan, faucet_vip = router.vip_map(dst_ip)
-            if vlan and faucet_vip and faucet_vip.ip != dst_ip:
+            if vlan and vlan.ip_in_vip_subnet(dst_ip, faucet_vip) and faucet_vip.ip != dst_ip:
                 limit = self._vlan_nexthop_cache_limit(vlan)
                 if limit is None or len(self._vlan_nexthop_cache(vlan)) < limit:
                     resolution_in_progress = self._is_host_fib_route(vlan, dst_ip)

faucet/vlan.py

@@ -514,14 +514,16 @@ def vip_map(self, ipa):
                 return faucet_vip
         return None
 
-    def is_faucet_vip(self, ipa):
+    def is_faucet_vip(self, ipa, faucet_vip=None):
         """Return True if IP is a VIP on this VLAN."""
-        faucet_vip = self.vip_map(ipa)
+        if faucet_vip is None:
+            faucet_vip = self.vip_map(ipa)
         return faucet_vip and ipa == faucet_vip.ip
 
-    def ip_in_vip_subnet(self, ipa):
+    def ip_in_vip_subnet(self, ipa, faucet_vip=None):
         """Return faucet_vip if IP in same IP network as a VIP on this VLAN."""
-        faucet_vip = self.vip_map(ipa)
+        if faucet_vip is None:
+            faucet_vip = self.vip_map(ipa)
         if faucet_vip:
             if ipa not in (
                     faucet_vip.network.network_address,

tests/integration/mininet_tests.py

@@ -3972,15 +3972,19 @@ def _vids():
         proactive_learn_v4: True
         interfaces:
             %s:
+                native_vlan: 99
                 tagged_vlans: [%s]
                 description: "b1"
             %s:
+                native_vlan: 99
                 tagged_vlans: [%s]
                 description: "b2"
             %s:
+                native_vlan: 99
                 tagged_vlans: [%s]
                 description: "b3"
             %s:
+                native_vlan: 99
                 tagged_vlans: [%s]
                 description: "b4"
 """ % ('%(port_1)d', ','.join(STR_VIDS),
@@ -3996,29 +4000,46 @@ def test_tagged(self):
                 vlan_int = '%s.%u' % (host.intf_root_name, vid)
                 ipa = '192.168.%u.%u' % (vid, i)
                 ipg = '192.168.%u.254' % vid
+                ipd = '192.168.%u.253' % vid
                 setup_commands.extend([
                     'ip link add link %s name %s type vlan id %u' % (
                         host.intf_root_name, vlan_int, vid),
                     'ip link set dev %s up' % vlan_int,
                     'ip address add %s/24 brd + dev %s' % (ipa, vlan_int),
+                    'arp -s %s 0e:00:00:00:00:01' % ipd,
+                    'fping -c1 -t1 -I%s %s > /dev/null 2> /dev/null' % (vlan_int, ipd),
                     'ping -c1 -i0.1 -I%s %s > /dev/null' % (vlan_int, ipg)])
                 for j, _ in enumerate(hosts, start=1):
                     if j != i:
                         other_ip = '192.168.%u.%u/32' % (vid, j)
                         setup_commands.append(
                             'ip -4 route add %s via %s' % (other_ip, ipg))
             self.quiet_commands(host, setup_commands)
+
+        # ensure learn ban present for down nexthop
+        self.wait_nonzero_packet_count_flow(
+            {u'dl_type': 2048, u'dl_vlan': u'2047', u'nw_dst': u'192.168.101.253'},
+            table_id=self._IPV4_FIB_TABLE, actions=[])
+
         host, other_host = hosts
-        host_ip = ipaddress.ip_address(unicode(host.IP())) # pytype: disable=name-error
-        other_host_ip = ipaddress.ip_address(unicode(other_host.IP())) # pytype: disable=name-error
-        self.verify_iperf_min(
-            ((host, self.port_map['port_1']),
-             (other_host, self.port_map['port_2'])),
-            1, host_ip, other_host_ip)
+        for ip_pair in (
+                (host.IP(), other_host.IP()), # non-routed
+                ('192.168.%u.1' % self.NEW_VIDS[0], '192.168.%u.2' % self.NEW_VIDS[0])): # non-routed
+            host_ip_str, other_ip_str = ip_pair
+            host_ip = ipaddress.ip_address(unicode(host_ip_str))
+            other_ip = ipaddress.ip_address(unicode(other_ip_str))
+            self.verify_iperf_min(
+                ((host, self.port_map['port_1']),
+                 (other_host, self.port_map['port_2'])),
+                1, host_ip, other_ip)
+
         for vid in self.NEW_VIDS:
+            host_vlan_int = '%s.%u' % (host.intf_root_name, vid)
+            other_vlan_int = '%s.%u' % (other_host.intf_root_name, vid)
+            host_ip = '192.168.%u.%u' % (vid, 1)
             other_ip = '192.168.%u.%u' % (vid, 2)
-            vlan_int = '%s.%u' % (host.intf_root_name, vid)
-            self.one_ipv4_ping(host, other_ip, intf=vlan_int)
+            self.one_ipv4_ping(host, other_ip, intf=host_vlan_int)
+            self.one_ipv4_ping(other_host, host_ip, intf=other_vlan_int)
 
 
 class FaucetTaggedScaleTest(FaucetTaggedTest):