Merge pull request #2549 from anarkiwi/master

 Some OFAs require minimum idle time so add config check.

faucet/dp.py

@@ -329,6 +329,7 @@ def check_config(self):
             'invalid MAC address %s' % self.faucet_dp_mac))
         test_config_condition(not (self.interfaces or self.interface_ranges), (
             'DP %s must have at least one interface' % self))
+        test_config_condition(self.timeout < 15, ('timeout must be > 15'))
         # To prevent L2 learning from timing out before L3 can refresh
         test_config_condition(not (self.arp_neighbor_timeout < (self.timeout / 2)), (
             'L2 timeout must be > ARP timeout * 2'))

tests/integration/mininet_tests.py

@@ -1881,15 +1881,15 @@ class FaucetSingleHostsTimeoutPrometheusTest(FaucetUntaggedTest):
        If the maximum number of MACs at any one time is 5, then only 5 values
        should be exported, even if over 2 hours, there are 100 MACs learnt
     """
-    TIMEOUT = 10
+    TIMEOUT = 15
     CONFIG_GLOBAL = """
 vlans:
     100:
         description: "untagged"
 """
 
     CONFIG = """
-        timeout: 10
+        timeout: 15
         arp_neighbor_timeout: 4
         nd_neighbor_timeout: 4
         ignore_learn_ins: 0
@@ -1993,7 +1993,7 @@ class FaucetSingleHostsNoIdleTimeoutPrometheusTest(FaucetSingleHostsTimeoutProme
     """Test broken reset idle timer on flow refresh workaround."""
 
     CONFIG = """
-        timeout: 10
+        timeout: 15
         arp_neighbor_timeout: 4
         nd_neighbor_timeout: 4
         ignore_learn_ins: 0