Merge pull request #2511 from anarkiwi/master

LACP can cause a loop.

Author: anarkiwi

faucet/valve_flood.py

@@ -59,13 +59,18 @@ def _build_flood_local_rule_actions(vlan, exclude_unicast, in_port):
         flood_acts = []
         exclude_ports = set()
         lags = vlan.lags()
+        lags_up = vlan.lags_up()
         if lags:
             if in_port is not None and in_port.lacp:
                 # Don't flood from one LACP bundle member, to another.
                 exclude_ports.update(lags[in_port.lacp])
             # Pick one up bundle member to flood to.
-            for ports in list(lags.values()):
-                exclude_ports.update(ports[1:])
+            for lag, ports in list(lags.items()):
+                ports_up = lags_up[lag]
+                if ports_up:
+                    exclude_ports.update(ports[1:])
+                else:
+                    exclude_ports.update(ports)
         tagged_ports = vlan.tagged_flood_ports(exclude_unicast)
         flood_acts.extend(valve_of.flood_tagged_port_outputs(
             tagged_ports, in_port=in_port, exclude_ports=exclude_ports))

faucet/vlan.py

@@ -492,11 +492,22 @@ def mirrored_ports(self):
         """Return ports that are mirrored on this VLAN."""
         return tuple([port for port in self.get_ports() if port.mirror])
 
+    def lacp_ports(self):
+        """Return ports that have LACP on this VLAN."""
+        return tuple([port for port in self.get_ports() if port.lacp])
+
     def lacp_up_ports(self):
         """Return ports that have LACP up on this VLAN."""
-        return tuple([port for port in self.get_ports() if port.lacp and port.dyn_lacp_up])
+        return tuple([port for port in self.lacp_ports() if port.dyn_lacp_up])
 
     def lags(self):
+        """Return dict of LAGs mapped to member ports."""
+        lags = collections.defaultdict(list)
+        for port in self.lacp_ports():
+            lags[port.lacp].append(port)
+        return lags
+
+    def lags_up(self):
         """Return dict of LAGs mapped to member ports that have LACP up."""
         lags = collections.defaultdict(list)
         for port in self.lacp_up_ports():

tests/integration/mininet_tests.py

@@ -6316,7 +6316,7 @@ def setUp(self): # pylint: disable=invalid-name
             n_dps=self.NUM_DPS,
             n_untagged=self.NUM_HOSTS,
             untagged_vid=self.VID,
-            switch_to_switch_links=1,
+            switch_to_switch_links=2,
             hw_dpid=self.hw_dpid,
             lacp=True)
         self.start_net()