Merge pull request #2018 from anarkiwi/master

 Add config test/doc for force_port_vlan.

Author: anarkiwi

README.rst

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

docs/configuration.rst

@@ -791,6 +791,10 @@ is a dictionary of actions to apply upon match.
       - False
       - If True allow the packet to continue through the Faucet pipeline, if
         False drop the packet.
+    * - force_port_vlan
+      - boolean
+      - False
+      - if True, don't verify VLAN/port association.
     * - cookie
       - int, 0-2**16
       - defaults to datapath cookie value

tests/test_config.py

@@ -1590,6 +1590,31 @@ def test_push_pop_vlans_acl(self):
 """
         self.check_config_success(config, cp.dp_parser)
 
+    def test_force_port_vlan(self):
+        """Test push force_port_vlan."""
+        config = """
+acls:
+    good_acl:
+        rules:
+            - rule:
+                actions:
+                    allow: 1
+                    force_port_vlan: 1
+                    output:
+                        swap_vid: 101
+vlans:
+    guest:
+        vid: 100
+dps:
+    sw1:
+        dp_id: 0x1
+        interfaces:
+            1:
+                tagged_vlans: [100]
+                acl_in: good_acl
+"""
+        self.check_config_success(config, cp.dp_parser)
+
     def test_failover_acl(self):
         """Test failover ACL fields."""
         config = """