diff options
| author |   Matus Fabian <matfabia@cisco.com> | 2017-04-12 03:36:13 -0700 |
|---|---|---|
| committer |   Ole Trøan <otroan@employees.org> | 2017-04-12 13:09:34 +0000 |
| commit | 6a0946f078183361a5b757f6405165089b659c5c (patch) | |
| tree | 23ea7f7b823f9e987e18234365dd90de013d308f /test | |
| parent | f3ebb452ca26318b75b8f93569c3c752f05aed25 (diff) | |
CGN: configurable timeouts
add API and CLI configuration of deterministic NAT session timeout for TCP, UDP
and ICMP protocol
Change-Id: I577440452e7eaedcb5d80501a7fd4b76e31e8c9c
Signed-off-by: Matus Fabian <matfabia@cisco.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_snat.py | 19 | ||||
| -rw-r--r-- | test/vpp_papi_provider.py | 27 |
2 files changed, 46 insertions, 0 deletions
diff --git a/test/test_snat.py b/test/test_snat.py index 0708d440714..4739a7ceb7a 100644 --- a/test/test_snat.py +++ b/test/test_snat.py @@ -1345,10 +1345,29 @@ class TestDeterministicNAT(MethodHolder): deterministic_mappings = self.vapi.snat_det_map_dump() self.assertEqual(len(deterministic_mappings), 0) + def test_set_timeouts(self): + """ Set deterministic NAT timeouts """ + timeouts_before = self.vapi.snat_det_get_timeouts() + + self.vapi.snat_det_set_timeouts(timeouts_before.udp + 10, + timeouts_before.tcp_established + 10, + timeouts_before.tcp_transitory + 10, + timeouts_before.icmp + 10) + + timeouts_after = self.vapi.snat_det_get_timeouts() + + self.assertNotEqual(timeouts_before.udp, timeouts_after.udp) + self.assertNotEqual(timeouts_before.icmp, timeouts_after.icmp) + self.assertNotEqual(timeouts_before.tcp_established, + timeouts_after.tcp_established) + self.assertNotEqual(timeouts_before.tcp_transitory, + timeouts_after.tcp_transitory) + def clear_snat(self): """ Clear SNAT configuration. """ + self.vapi.snat_det_set_timeouts() deterministic_mappings = self.vapi.snat_det_map_dump() for dsm in deterministic_mappings: self.vapi.snat_add_det_map(dsm.in_addr, diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py index ceb684b75f6..4541f01a1bd 100644 --- a/test/vpp_papi_provider.py +++ b/test/vpp_papi_provider.py @@ -1199,6 +1199,33 @@ class VppPapiProvider(object): """ return self.api(self.papi.snat_det_map_dump, {}) + def snat_det_set_timeouts( + self, + udp=300, + tcp_established=7440, + tcp_transitory=240, + icmp=60): + """Set values of timeouts for deterministic NAT (in seconds) + + :param udp - UDP timeout (Default value = 300) + :param tcp_established - TCP established timeout (Default value = 7440) + :param tcp_transitory - TCP transitory timeout (Default value = 240) + :param icmp - ICMP timeout (Default value = 60) + """ + return self.api( + self.papi.snat_det_set_timeouts, + {'udp': udp, + 'tcp_established': tcp_established, + 'tcp_transitory': tcp_transitory, + 'icmp': icmp}) + + def snat_det_get_timeouts(self): + """Get values of timeouts for deterministic NAT + + :return: Timeouts for deterministic NAT (in seconds) + """ + return self.api(self.papi.snat_det_get_timeouts, {}) + def control_ping(self): self.api(self.papi.control_ping) |