Merge branch 'master' into vlan

Author: anarkiwi

clib/mininet_test_base.py

@@ -1545,7 +1545,10 @@ def change_port_config(self, port, config_name, config_value,
         if config_name is None:
             del conf['dps'][self.DP_NAME]['interfaces'][port]
         else:
-            conf['dps'][self.DP_NAME]['interfaces'][port][config_name] = config_value
+            if config_value is None:
+                del conf['dps'][self.DP_NAME]['interfaces'][port][config_name]
+            else:
+                conf['dps'][self.DP_NAME]['interfaces'][port][config_name] = config_value
         self.reload_conf(
             conf, self.faucet_config_path,
             restart, cold_start, hup=hup)
@@ -1877,12 +1880,13 @@ def verify_ping_mirrored(self, first_host, second_host, mirror_host, both_mirror
         self.assertGreaterEqual(received_pings, expected_pings)
         self.assertLessEqual(received_pings, max_expected_pings)
 
-    def verify_bcast_ping_mirrored(self, first_host, second_host, mirror_host, tagged=False):
+    def verify_bcast_ping_mirrored(self, first_host, second_host, mirror_host, tagged=False, require_learned=True):
         """Verify that broadcast to a mirrored port, is mirrored."""
-        self.ping((first_host, second_host))
-        for host in (first_host, second_host):
-            self.require_host_learned(host)
-        self.retry_net_ping(hosts=(first_host, second_host))
+        if require_learned:
+            self.ping((first_host, second_host))
+            for host in (first_host, second_host):
+                self.require_host_learned(host)
+            self.retry_net_ping(hosts=(first_host, second_host))
         tcpdump_filter = (
             'ether src %s and ether dst ff:ff:ff:ff:ff:ff and '
             'icmp[icmptype] == 8') % second_host.MAC()

docs/requirements.txt

@@ -1,4 +1,4 @@
 -r ../requirements.txt
-sphinx==3.0.2
+sphinx==3.0.3
 sphinx_rtd_theme==0.4.3
 sphinxcontrib-svg2pdfconverter

faucet/dp.py

@@ -1539,6 +1539,16 @@ def _add_changed_vlan_port(port, port_dp):
                     changed_acl_ports.add(port_no)
                     logger.info('port %s ACL changed (ACL %s to %s)' % (
                         port_no, old_acl_ids, new_acl_ids))
+            # If any of the changed VLANs have tagged ports we will need to restore their flows,
+            # even if those tagged ports didn't change, as the delete VLAN operation uses
+            # a wildcard delete.
+            for port_no in same_ports:
+                old_port = self.ports[port_no]
+                new_port = new_dp.ports[port_no]
+                for tagged_vlan in new_port.tagged_vlans:
+                    if tagged_vlan.vid in changed_vlans:
+                        logger.info('port %s has a changed tagged VLAN' % port_no)
+                        changed_ports.add(port_no)
 
             if changed_acl_ports:
                 same_ports -= changed_acl_ports

tests/integration/mininet_tests.py

@@ -5513,6 +5513,20 @@ def test_tagged(self):
              (second_host, self.port_map['port_2'])),
             MIN_MBPS, first_host_ip, second_host_ip,
             sync_counters_func=lambda: self.one_ipv4_ping(first_host, second_host_ip))
+        tagged_ports = (self.port_map['port_1'], self.port_map['port_2'], self.port_map['port_4'])
+        for port in tagged_ports:
+            self.wait_until_matching_flow(
+                {'vlan_vid': 100, 'in_port': port},
+                table_id=self._VLAN_TABLE,
+                actions=['GOTO_TABLE:%u' % self._ETH_SRC_TABLE])
+        self.change_port_config(
+            self.port_map['port_3'], 'mirror', None,
+            restart=True, cold_start=False)
+        for port in tagged_ports:
+            self.wait_until_matching_flow(
+                {'vlan_vid': 100, 'in_port': port},
+                table_id=self._VLAN_TABLE,
+                actions=['GOTO_TABLE:%u' % self._ETH_SRC_TABLE])
 
 
 class FaucetTaggedVLANPCPTest(FaucetTaggedTest):