diff options
| author |   Neale Ranns <nranns@cisco.com> | 2017-03-10 03:04:12 -0800 |
|---|---|---|
| committer |   Ole Trøan <otroan@employees.org> | 2017-03-10 12:50:54 +0000 |
| commit | 69b7aa424abaec4adae0e9007794cf35a7f9849f (patch) | |
| tree | 22260de38a9094fbfa871e4e565cb7a3a447fb56 /test | |
| parent | 78053e164fbb75c014126a3deff440f165504582 (diff) | |
Fix MAP-E UT. Add functionality in MAP code to delete the pre-resolved next-hops. UT checks for no-leftover-state now pass
Change-Id: I9e980ee117c0b6aebc6c7a0fcc153a7c0eaf0c72
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_map.py | 20 | ||||
| -rw-r--r-- | test/vpp_ip_route.py | 10 |
2 files changed, 20 insertions, 10 deletions
diff --git a/test/test_map.py b/test/test_map.py index 6bcd70e943e..9ac3948abf4 100644 --- a/test/test_map.py +++ b/test/test_map.py @@ -62,7 +62,6 @@ class TestMAP(VppTestCase): self.assertEqual(rx[IPv6].src, ip6_src) self.assertEqual(rx[IPv6].dst, ip6_dst) - @unittest.skip("Doesn't Work") def test_map_e(self): """ MAP-E """ @@ -155,18 +154,21 @@ class TestMAP(VppTestCase): # # change the route to the pre-solved next-hop # - pre_res_route1 = VppIpRoute(self, - "4001::1", - 128, - [VppRoutePath(self.pg1.remote_hosts[3].ip6, - self.pg1.sw_if_index, - is_ip6=1)], - is_ip6=1) - pre_res_route1.add_vpp_config() + pre_res_route.modify([VppRoutePath(self.pg1.remote_hosts[3].ip6, + self.pg1.sw_if_index, + is_ip6=1)]) + pre_res_route.add_vpp_config() self.send_and_assert_encapped(v4, map_src, "2001::c0a8:0:0", dmac=self.pg1.remote_hosts[3].mac) + # + # cleanup. The test infra's object registry will ensure + # the route is really gone and thus that the unresolve worked. + # + pre_res_route.remove_vpp_config() + self.vapi.ppcli("map params pre-resolve del ip6-nh 4001::1") + if __name__ == '__main__': unittest.main(testRunner=VppTestRunner) diff --git a/test/vpp_ip_route.py b/test/vpp_ip_route.py index 7a62b230fc1..e1c2b4b41f9 100644 --- a/test/vpp_ip_route.py +++ b/test/vpp_ip_route.py @@ -79,6 +79,13 @@ class VppIpRoute(VppObject): else: self.dest_addr = inet_pton(AF_INET, dest_addr) + def modify(self, paths, is_local=0, + is_unreach=0, is_prohibit=0): + self.paths = paths + self.is_local = is_local + self.is_unreach = is_unreach + self.is_prohibit = is_prohibit + def add_vpp_config(self): if self.is_local or self.is_unreach or self.is_prohibit: self._test.vapi.ip_add_del_route( @@ -126,7 +133,8 @@ class VppIpRoute(VppObject): path.nh_addr, path.nh_itf, table_id=self.table_id, - is_add=0) + is_add=0, + is_ipv6=self.is_ip6) def query_vpp_config(self): return find_route(self._test, |