From 5f83322b22a6d478af8541c3fc30d87ca9ff7f9e Mon Sep 17 00:00:00 2001 From: Josh Bailey Date: Mon, 1 Oct 2018 11:19:16 +1300 Subject: [PATCH 1/3] Try again to upgrade to pytype 2018.9.26 now using /var/tmp. --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 49ec74525b..93672806e9 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,5 +8,5 @@ netifaces packaging pylint pytest-cov -pytype==2018.9.19 +pytype==2018.9.26 requests From 3215f7cd7f841591bed377cd91b58e0f66dffafb Mon Sep 17 00:00:00 2001 From: Josh Bailey Date: Mon, 1 Oct 2018 11:26:44 +1300 Subject: [PATCH 2/3] Some OFAs require minimum idle time so add config check. --- faucet/dp.py | 1 + tests/integration/mininet_tests.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/faucet/dp.py b/faucet/dp.py index 5bf34444aa..e01f9cf5c3 100644 --- a/faucet/dp.py +++ b/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')) diff --git a/tests/integration/mininet_tests.py b/tests/integration/mininet_tests.py index 87fcc7b7f5..8e3dd24779 100644 --- a/tests/integration/mininet_tests.py +++ b/tests/integration/mininet_tests.py @@ -1881,7 +1881,7 @@ 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: @@ -1889,7 +1889,7 @@ class FaucetSingleHostsTimeoutPrometheusTest(FaucetUntaggedTest): """ 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 From 23ad7885ee1be8f116300698f642627105589b8b Mon Sep 17 00:00:00 2001 From: Josh Bailey Date: Mon, 1 Oct 2018 11:52:23 +1300 Subject: [PATCH 3/3] Revert "Try again to upgrade to pytype 2018.9.26 now using /var/tmp." This reverts commit 5f83322b22a6d478af8541c3fc30d87ca9ff7f9e. --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 93672806e9..49ec74525b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,5 +8,5 @@ netifaces packaging pylint pytest-cov -pytype==2018.9.26 +pytype==2018.9.19 requests