Fix vnet unit tests
Change-Id: Ibe55e4399c6b78d83268d7c49ed498cab7bfdb43
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
diff --git a/src/tests/vnet/lisp-cp/test_cp_serdes.c b/src/tests/vnet/lisp-cp/test_cp_serdes.c
index 0766bee..8e8c845 100644
--- a/src/tests/vnet/lisp-cp/test_cp_serdes.c
+++ b/src/tests/vnet/lisp-cp/test_cp_serdes.c
@@ -21,9 +21,6 @@
#include <vlibapi/api.h>
#include <vnet/lisp-cp/packets.h>
-/* FIXME */
-#include <vlibapi/api_helper_macros.h>
-
#define _assert(e) \
error = CLIB_ERROR_ASSERT (e); \
if (error) \
@@ -489,6 +486,53 @@
return error;
}
+static vlib_buffer_t *
+create_buffer (u8 * data, u32 data_len)
+{
+ vlib_buffer_t *b;
+
+ u8 *buf_data = clib_mem_alloc(500);
+ memset (buf_data, 0, 500);
+ b = (vlib_buffer_t *)buf_data;
+
+ u8 * p = vlib_buffer_put_uninit (b, data_len);
+ clib_memcpy (p, data, data_len);
+
+ return b;
+}
+
+static clib_error_t *
+test_lisp_parse_map_reply ()
+{
+ clib_error_t * error = 0;
+ u8 map_reply_data[] =
+ {
+ 0x00, 0x00, 0x00, 0x01, /* type; rsvd; mapping count */
+ 0x00, 0x00, 0x00, 0x00,
+ };
+ vlib_buffer_t *b = create_buffer (map_reply_data, sizeof (map_reply_data));
+ map_records_arg_t *mrecs = parse_map_reply (b);
+ _assert (0 == mrecs);
+ clib_mem_free (b);
+
+ u8 map_reply_data2[] =
+ {
+ 0x00, 0x00, 0x00, 0x01, /* type; rsvd */
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, /* nonce */
+
+ /* 1. record - incomplete */
+ 0x01, 0x02, 0x03, 0x04, /* record TTL */
+ 0x01, /* locator count */
+ };
+ b = create_buffer (map_reply_data2, sizeof (map_reply_data2));
+ mrecs = parse_map_reply (b);
+ _assert (0 == mrecs);
+done:
+ clib_mem_free (b);
+ return error;
+}
+
static clib_error_t *
test_lisp_parse_lcaf ()
{
@@ -610,6 +654,7 @@
_(lisp_msg_push_ecm) \
_(lisp_msg_parse) \
_(lisp_msg_parse_mapping_record) \
+ _(lisp_parse_map_reply) \
_(lisp_parse_lcaf) \
_(lisp_map_register)
diff --git a/src/tests/vnet/lisp-cp/test_lisp_types.c b/src/tests/vnet/lisp-cp/test_lisp_types.c
index fa34a3c..2157501 100644
--- a/src/tests/vnet/lisp-cp/test_lisp_types.c
+++ b/src/tests/vnet/lisp-cp/test_lisp_types.c
@@ -18,9 +18,6 @@
#include <vnet/lisp-cp/lisp_types.h>
#include <vnet/lisp-cp/lisp_cp_messages.h>
-/* FIXME */
-#include <vlibapi/api_helper_macros.h>
-
#define _assert(e) \
error = CLIB_ERROR_ASSERT (e); \
if (error) \
@@ -265,7 +262,6 @@
}
#endif
-#if 0 /* uncomment this once VNI is supported */
static clib_error_t * test_write_mac_in_lcaf (void)
{
clib_error_t * error = 0;
@@ -276,13 +272,12 @@
gid_address_t g =
{
.mac = {0x1, 0x2, 0x3, 0x4, 0x5, 0x6},
- .vni = 0x30,
+ .vni = 0x01020304,
.vni_mask = 0x10,
.type = GID_ADDR_MAC,
};
u16 len = gid_address_put (b, &g);
- _assert (8 == len);
u8 expected[] =
{
@@ -290,20 +285,20 @@
0x00, /* reserved1 */
0x00, /* flags */
0x02, /* LCAF type = Instance ID */
- 0x20, /* IID/VNI mask len */
- 0x00, 0x0a, /* length */
+ 0x10, /* IID/IID mask len */
+ 0x00, 0x0c, /* length */
0x01, 0x02, 0x03, 0x04, /* Instance ID / VNI */
- 0x00, 0x06, /* AFI = MAC */
+ 0x40, 0x05, /* AFI = MAC */
0x01, 0x02, 0x03, 0x04,
0x05, 0x06 /* MAC */
- }
+ };
+ _assert (sizeof (expected) == len);
_assert (0 == memcmp (expected, b, len));
done:
clib_mem_free (b);
return error;
}
-#endif
static clib_error_t * test_mac_address_write (void)
{
@@ -418,6 +413,32 @@
}
static clib_error_t *
+test_src_dst_deser_bad_afi (void)
+{
+ clib_error_t * error = 0;
+
+ u8 expected_data[] =
+ {
+ 0x40, 0x03, 0x00, 0x00, /* AFI = LCAF, reserved1, flags */
+ 0x0c, 0x00, 0x00, 0x14, /* LCAF type = source/dest key, rsvd, length */
+ 0x00, 0x00, 0x00, 0x00, /* reserved; source-ML, Dest-ML */
+
+ 0xde, 0xad, /* AFI = bad value */
+ 0x11, 0x22, 0x33, 0x44,
+ 0x55, 0x66, /* source */
+
+ 0x40, 0x05, /* AFI = MAC */
+ 0x10, 0x21, 0x32, 0x43,
+ 0x54, 0x65, /* destination */
+ };
+
+ gid_address_t p;
+ _assert (~0 == gid_address_parse (expected_data, &p));
+done:
+ return error;
+}
+
+static clib_error_t *
test_src_dst_serdes (void)
{
clib_error_t * error = 0;
@@ -537,6 +558,8 @@
_(mac_address_write) \
_(gid_address_write) \
_(src_dst_serdes) \
+ _(write_mac_in_lcaf) \
+ _(src_dst_deser_bad_afi) \
_(src_dst_with_vni_serdes)
int run_tests (void)