From 640edcd9016f2381ea1efeaab78e834068c0e862 Mon Sep 17 00:00:00 2001 From: Klement Sekera Date: Mon, 23 Sep 2019 09:00:30 +0000 Subject: map: use SVR for MAP-T This change is part of an effort to unify reassembly code. By removing shallow virtual reassembly functionality in MAP and using the common vnet provided shallow virtual reassembly, code size and complexity is reduced. Type: refactor Change-Id: Iec8edd039f7b967b53e17bb9bca228a8b452ac0c Signed-off-by: Klement Sekera --- src/plugins/map/test/test_map.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/plugins/map/test') diff --git a/src/plugins/map/test/test_map.py b/src/plugins/map/test/test_map.py index cf1e6f89616..368cf51092d 100644 --- a/src/plugins/map/test/test_map.py +++ b/src/plugins/map/test/test_map.py @@ -146,8 +146,6 @@ class TestMAP(VppTestCase): for p in rx: self.validate(p[1], v4_reply) - self.logger.debug("show trace") - # # Fire in a v4 packet that will be encapped to the BR # @@ -158,7 +156,6 @@ class TestMAP(VppTestCase): self.send_and_assert_encapped_one(v4, "3000::1", map_translated_addr) - self.logger.debug("show trace") # # Verify reordered fragments are able to pass as well # @@ -172,8 +169,6 @@ class TestMAP(VppTestCase): self.send_and_assert_encapped(frags, "3000::1", map_translated_addr) - self.logger.debug("show trace") - # Enable MAP on interface. self.vapi.map_if_enable_disable(is_enable=1, sw_if_index=self.pg1.sw_if_index, @@ -237,8 +232,6 @@ class TestMAP(VppTestCase): self.assertEqual(r[IP].src, p[IP].src) self.assertEqual(r[IP].dst, p[IP].dst) - return - # # Pre-resolve. No API for this!! # @@ -257,7 +250,7 @@ class TestMAP(VppTestCase): pre_res_route.add_vpp_config() self.send_and_assert_encapped_one(v4, "3000::1", - "2001::c0a8:0:0", + map_translated_addr, dmac=self.pg1.remote_hosts[2].mac) # @@ -268,7 +261,7 @@ class TestMAP(VppTestCase): pre_res_route.add_vpp_config() self.send_and_assert_encapped_one(v4, "3000::1", - "2001::c0a8:0:0", + map_translated_addr, dmac=self.pg1.remote_hosts[3].mac) # @@ -447,6 +440,7 @@ class TestMAP(VppTestCase): for p in rx: pass # p.show2() + # reass_pkt = reassemble(rx) # p4_reply.ttl -= 1 # p4_reply.id = 256 -- cgit 1.2.3-korg