quic: Add missing session_migrate_callback

[vpp.git] / test / test_nat.py

diff --git a/test/test_nat.py b/test/test_nat.py
index bf22602..773eb51 100644 (file)
--- a/test/test_nat.py
+++ b/test/test_nat.py
@@ -2818,7 +2818,7 @@ class TestNAT44(MethodHolder):
         capture = self.pg1.get_capture(len(pkts))
         self.verify_capture_out(capture)
         self.nat44_add_address(self.nat_addr, is_add=0)
-        self.vapi.cli("ipfix flush")  # FIXME this should be an API call
+        self.vapi.ipfix_flush()
         capture = self.pg3.get_capture(9)
         ipfix = IPFIXDecoder()
         # first load template
@@ -2863,7 +2863,7 @@ class TestNAT44(MethodHolder):
         self.pg_start()
         self.pg1.assert_nothing_captured()
         sleep(1)
-        self.vapi.cli("ipfix flush")  # FIXME this should be an API call
+        self.vapi.ipfix_flush()
         capture = self.pg3.get_capture(9)
         ipfix = IPFIXDecoder()
         # first load template
@@ -2926,7 +2926,7 @@ class TestNAT44(MethodHolder):
         self.pg_start()
         self.pg1.assert_nothing_captured()
         sleep(1)
-        self.vapi.cli("ipfix flush")  # FIXME this should be an API call
+        self.vapi.ipfix_flush()
         capture = self.pg3.get_capture(9)
         ipfix = IPFIXDecoder()
         # first load template
@@ -3670,10 +3670,22 @@ class TestNAT44(MethodHolder):
             sw_if_index=self.pg1.sw_if_index,
             is_add=1)
 
+        reas_cfg1 = self.vapi.nat_get_reass()
+        # this test was intermittently failing in some cases
+        # until we temporarily bump the reassembly timeouts
+        self.vapi.nat_set_reass(timeout=20, max_reass=1024, max_frag=5,
+                                drop_frag=0)
+
         self.frag_in_order(proto=IP_PROTOS.tcp)
         self.frag_in_order(proto=IP_PROTOS.udp)
         self.frag_in_order(proto=IP_PROTOS.icmp)
 
+        # restore the reassembly timeouts
+        self.vapi.nat_set_reass(timeout=reas_cfg1.ip4_timeout,
+                                max_reass=reas_cfg1.ip4_max_reass,
+                                max_frag=reas_cfg1.ip4_max_frag,
+                                drop_frag=reas_cfg1.ip4_drop_frag)
+
     def test_frag_forwarding(self):
         """ NAT44 forwarding fragment test """
         self.vapi.nat44_add_del_interface_addr(
@@ -3851,7 +3863,7 @@ class TestNAT44(MethodHolder):
         self.pg_start()
         self.pg1.assert_nothing_captured()
         sleep(1)
-        self.vapi.cli("ipfix flush")  # FIXME this should be an API call
+        self.vapi.ipfix_flush()
         capture = self.pg3.get_capture(9)
         ipfix = IPFIXDecoder()
         # first load template
@@ -4514,7 +4526,17 @@ class TestNAT44EndpointDependent(MethodHolder):
             sw_if_index=self.pg1.sw_if_index,
             is_add=1)
         self.vapi.nat44_forwarding_enable_disable(enable=True)
+        reas_cfg1 = self.vapi.nat_get_reass()
+        # this test was intermittently failing in some cases
+        # until we temporarily bump the reassembly timeouts
+        self.vapi.nat_set_reass(timeout=20, max_reass=1024, max_frag=5,
+                                drop_frag=0)
         self.frag_in_order(proto=IP_PROTOS.tcp, dont_translate=True)
+        # restore the reassembly timeouts
+        self.vapi.nat_set_reass(timeout=reas_cfg1.ip4_timeout,
+                                max_reass=reas_cfg1.ip4_max_reass,
+                                max_frag=reas_cfg1.ip4_max_frag,
+                                drop_frag=reas_cfg1.ip4_drop_frag)
 
     def test_frag_out_of_order(self):
         """ NAT44 translate fragments arriving out of order """
@@ -5762,7 +5784,7 @@ class TestNAT44EndpointDependent(MethodHolder):
                             self.config_flags.NAT_IS_EXT_HOST_VALID)
             self.assertTrue(sessions[0].flags &
                             self.config_flags.NAT_IS_TWICE_NAT)
-            self.logger.error(self.vapi.cli("show nat44 sessions detail"))
+            self.logger.info(self.vapi.cli("show nat44 sessions detail"))
             self.vapi.nat44_del_session(
                 address=sessions[0].inside_ip_address,
                 port=sessions[0].inside_port,
@@ -6776,7 +6798,7 @@ class TestNAT44EndpointDependent(MethodHolder):
         capture = self.pg1.assert_nothing_captured()
 
         # verify IPFIX logging
-        self.vapi.cli("ipfix flush")  # FIXME this should be an API call
+        self.vapi.ipfix_flush()
         sleep(1)
         capture = self.pg2.get_capture(10)
         ipfix = IPFIXDecoder()
@@ -7556,7 +7578,7 @@ class TestDeterministicNAT(MethodHolder):
         self.assertEqual(1000, dms[0].ses_num)
 
         # verify IPFIX logging
-        self.vapi.cli("ipfix flush")  # FIXME this should be an API call
+        self.vapi.ipfix_flush()
         sleep(1)
         capture = self.pg2.get_capture(2)
         ipfix = IPFIXDecoder()
@@ -8792,7 +8814,7 @@ class TestNAT64(MethodHolder):
         self.pg_start()
         self.pg1.assert_nothing_captured()
         sleep(1)
-        self.vapi.cli("ipfix flush")  # FIXME this should be an API call
+        self.vapi.ipfix_flush()
         capture = self.pg3.get_capture(9)
         ipfix = IPFIXDecoder()
         # first load template
@@ -8820,7 +8842,7 @@ class TestNAT64(MethodHolder):
         self.pg_start()
         self.pg1.assert_nothing_captured()
         sleep(1)
-        self.vapi.cli("ipfix flush")  # FIXME this should be an API call
+        self.vapi.ipfix_flush()
         capture = self.pg3.get_capture(1)
         # verify events in data set
         for p in capture:
@@ -8865,7 +8887,7 @@ class TestNAT64(MethodHolder):
         self.pg_start()
         self.pg1.assert_nothing_captured()
         sleep(1)
-        self.vapi.cli("ipfix flush")  # FIXME this should be an API call
+        self.vapi.ipfix_flush()
         capture = self.pg3.get_capture(9)
         ipfix = IPFIXDecoder()
         # first load template
@@ -8919,7 +8941,7 @@ class TestNAT64(MethodHolder):
         self.pg_start()
         p = self.pg1.get_capture(1)
         self.tcp_port_out = p[0][TCP].sport
-        self.vapi.cli("ipfix flush")  # FIXME this should be an API call
+        self.vapi.ipfix_flush()
         capture = self.pg3.get_capture(10)
         ipfix = IPFIXDecoder()
         # first load template
@@ -8954,7 +8976,7 @@ class TestNAT64(MethodHolder):
                                                 end_addr=self.nat_addr,
                                                 vrf_id=0xFFFFFFFF,
                                                 is_add=0)
-        self.vapi.cli("ipfix flush")  # FIXME this should be an API call
+        self.vapi.ipfix_flush()
         capture = self.pg3.get_capture(2)
         # verify events in data set
         for p in capture: