nat: nat44 cli bug fix

[vpp.git] / test / test_det44.py

diff --git a/test/test_det44.py b/test/test_det44.py
index ced7746..f137e76 100644 (file)
--- a/test/test_det44.py
+++ b/test/test_det44.py
@@ -5,7 +5,8 @@ import struct
 import unittest
 import scapy.compat
 from time import sleep
 import unittest
 import scapy.compat
 from time import sleep

-from framework import VppTestCase, running_extended_tests
+from config import config
+from framework import VppTestCase

 from ipfix import IPFIX, Set, Template, Data, IPFIXDecoder
 from scapy.layers.inet import IP, TCP, UDP, ICMP
 from scapy.layers.inet import IPerror, UDPerror
 from ipfix import IPFIX, Set, Template, Data, IPFIXDecoder
 from scapy.layers.inet import IP, TCP, UDP, ICMP
 from scapy.layers.inet import IPerror, UDPerror


@@ -577,7 +578,6 @@ class TestDET44(VppTestCase):
             self.logger.error("TCP session termination failed")
             raise
 
             self.logger.error("TCP session termination failed")
             raise
 

-    @unittest.skipUnless(running_extended_tests, "part of extended tests")

     def test_session_timeout(self):
         """ Deterministic NAT session timeouts """
         self.vapi.det44_add_del_map(is_add=1, in_addr=self.pg0.remote_ip4,
     def test_session_timeout(self):
         """ Deterministic NAT session timeouts """
         self.vapi.det44_add_del_map(is_add=1, in_addr=self.pg0.remote_ip4,


@@ -599,13 +599,13 @@ class TestDET44(VppTestCase):
         self.pg_enable_capture(self.pg_interfaces)
         self.pg_start()
         self.pg1.get_capture(len(pkts))
         self.pg_enable_capture(self.pg_interfaces)
         self.pg_start()
         self.pg1.get_capture(len(pkts))

-        sleep(15)
+        self.virtual_sleep(15)

 
         dms = self.vapi.det44_map_dump()
         self.assertEqual(0, dms[0].ses_num)
 
     # TODO: ipfix needs to be separated from NAT base plugin
 
         dms = self.vapi.det44_map_dump()
         self.assertEqual(0, dms[0].ses_num)
 
     # TODO: ipfix needs to be separated from NAT base plugin

-    @unittest.skipUnless(running_extended_tests, "part of extended tests")
+    @unittest.skipUnless(config.extended, "part of extended tests")

     def test_session_limit_per_user(self):
         """ Deterministic NAT maximum sessions per user limit """
         self.vapi.det44_add_del_map(is_add=1, in_addr=self.pg0.remote_ip4,
     def test_session_limit_per_user(self):
         """ Deterministic NAT maximum sessions per user limit """
         self.vapi.det44_add_del_map(is_add=1, in_addr=self.pg0.remote_ip4,


@@ -663,7 +663,6 @@ class TestDET44(VppTestCase):
 
         # verify IPFIX logging
         self.vapi.ipfix_flush()
 
         # verify IPFIX logging
         self.vapi.ipfix_flush()

-        sleep(1)

         capture = self.pg2.get_capture(2)
         ipfix = IPFIXDecoder()
         # first load template
         capture = self.pg2.get_capture(2)
         ipfix = IPFIXDecoder()
         # first load template