summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorPaul Vinciguerra <pvinci@vinciconsulting.com>2019-05-24 06:36:26 -0400
committerOle Trøan <otroan@employees.org>2019-05-29 07:41:53 +0000
commit4d376f67a6e259e747dbbd4551578657663840f7 (patch)
tree0ba6280d658017295c90be343d12f5ad6c7ce1c0 /test
parent68b24e2c9ae80839d15f680959cce31ca3ec2123 (diff)
map: Use vl_api_string macros.
* Add optional tag to api call in tests * Add test for map_domain_dump() for api code coverage. Type: fix Change-Id: I2f7784aecdca4bf9e94de3319f959786e3d2c607 Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
Diffstat (limited to 'test')
-rw-r--r--test/test_map.py48
1 files changed, 44 insertions, 4 deletions
diff --git a/test/test_map.py b/test/test_map.py
index 2f04db28b6e..39698cd2f7d 100644
--- a/test/test_map.py
+++ b/test/test_map.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
+import ipaddress
import unittest
from framework import VppTestCase, VppTestRunner
@@ -64,6 +65,34 @@ class TestMAP(VppTestCase):
self.assertEqual(rx[IPv6].src, ip6_src)
self.assertEqual(rx[IPv6].dst, ip6_dst)
+ def test_api_map_domain_dump(self):
+ map_dst = '2001::/64'
+ map_src = '3000::1/128'
+ client_pfx = '192.168.0.0/16'
+ tag = 'MAP-E tag.'
+ index = self.vapi.map_add_domain(ip4_prefix=client_pfx,
+ ip6_prefix=map_dst,
+ ip6_src=map_src,
+ tag=tag).index
+
+ rv = self.vapi.map_domain_dump()
+
+ # restore the state early so as to not impact subsequent tests.
+ # If an assert fails, we will not get the chance to do it at the end.
+ self.vapi.map_del_domain(index=index)
+
+ self.assertGreater(len(rv), 0,
+ "Expected output from 'map_domain_dump'")
+
+ # typedefs are returned as ipaddress objects.
+ # wrap results in str() ugh! to avoid the need to call unicode.
+ self.assertEqual(str(rv[0].ip4_prefix), client_pfx)
+ self.assertEqual(str(rv[0].ip6_prefix), map_dst)
+ self.assertEqual(str(rv[0].ip6_src), map_src)
+
+ self.assertEqual(rv[0].tag, tag,
+ "output produced incorrect tag value.")
+
def test_map_e(self):
""" MAP-E """
@@ -87,7 +116,11 @@ class TestMAP(VppTestCase):
map_dst = '2001::/64'
map_src = '3000::1/128'
client_pfx = '192.168.0.0/16'
- self.vapi.map_add_domain(map_dst, client_pfx, map_src)
+ tag = 'MAP-E tag.'
+ self.vapi.map_add_domain(ip4_prefix=client_pfx,
+ ip6_prefix=map_dst,
+ ip6_src=map_src,
+ tag=tag)
# Enable MAP on interface.
self.vapi.map_if_enable_disable(is_enable=1,
@@ -211,9 +244,16 @@ class TestMAP(VppTestCase):
map_dst = '2001:db8::/32'
map_src = '1234:5678:90ab:cdef::/64'
ip4_pfx = '192.168.0.0/24'
-
- self.vapi.map_add_domain(map_dst, ip4_pfx, map_src,
- 16, 6, 4, mtu=1500)
+ tag = 'MAP-T Tag.'
+
+ self.vapi.map_add_domain(ip6_prefix=map_dst,
+ ip4_prefix=ip4_pfx,
+ ip6_src=map_src,
+ ea_bits_len=16,
+ psid_offset=6,
+ psid_length=4,
+ mtu=1500,
+ tag=tag)
# Enable MAP-T on interfaces.
self.vapi.map_if_enable_disable(is_enable=1,