Revert "nat: static mappings in flow hash"

This reverts commit 69b7599e4b061a8996205f0304232ede84cb70d4.

Type: fix
Signed-off-by: Ole Troan <ot@cisco.com>
Change-Id: If531b122ae5a9f91c2fe6eaa0da69922a91f16d3

1 files changed, 10 insertions, 8 deletions

diff --git a/test/test_nat44_ed.py b/test/test_nat44_ed.py
index 2fb955afa74..ec8d7c8d159 100644
--- a/test/test_nat44_ed.py
+++ b/test/test_nat44_ed.py
@@ -19,8 +19,7 @@ from vpp_ip_route import VppIpRoute, VppRoutePath
 from vpp_papi import VppEnum
 
 
-class TestNAT44ED(VppTestCase):
-    """ NAT44ED Test Case """
+class NAT44EDTestCase(VppTestCase):
 
     nat_addr = '10.0.0.3'
 
@@ -38,18 +37,17 @@ class TestNAT44ED(VppTestCase):
     max_sessions = 100
 
     def setUp(self):
-        super().setUp()
+        super(NAT44EDTestCase, self).setUp()
         self.plugin_enable()
 
     def tearDown(self):
-        super().tearDown()
+        super(NAT44EDTestCase, self).tearDown()
         if not self.vpp_dead:
             self.plugin_disable()
 
     def plugin_enable(self):
         self.vapi.nat44_ed_plugin_enable_disable(
-            sessions=self.max_sessions, enable=1,
-            inside_vrf=0, outside_vrf=1)
+            sessions=self.max_sessions, enable=1)
 
     def plugin_disable(self):
         self.vapi.nat44_ed_plugin_enable_disable(enable=0)
@@ -148,7 +146,7 @@ class TestNAT44ED(VppTestCase):
 
     @classmethod
     def setUpClass(cls):
-        super().setUpClass()
+        super(NAT44EDTestCase, cls).setUpClass()
 
         cls.create_pg_interfaces(range(12))
         cls.interfaces = list(cls.pg_interfaces[:4])
@@ -912,6 +910,10 @@ class TestNAT44ED(VppTestCase):
             self.assertEqual(sd_params.get('XDPORT'),
                              "%d" % self.tcp_external_port)
 
+
+class TestNAT44ED(NAT44EDTestCase):
+    """ NAT44ED Test Case """
+
     def test_icmp_error(self):
         """ NAT44ED test ICMP error message with inner header"""
 
@@ -2256,7 +2258,7 @@ class TestNAT44EDMW(TestNAT44ED):
 
         self.pg_enable_capture(self.pg_interfaces)
         self.pg_start()
-        capture = self.pg1.get_capture(pkt_count * 3, timeout=5)
+        capture = self.pg1.get_capture(pkt_count * 3)
 
         if_idx = self.pg0.sw_if_index
         tc2 = self.statistics['/nat44-ed/in2out/slowpath/tcp']