Add API dump call for vrf/vni mapping to vpp-api-test

[vpp.git] / vpp / vpp-api / api.c

diff --git a/vpp/vpp-api/api.c b/vpp/vpp-api/api.c
index f7338af..63e0ed2 100644 (file)
--- a/vpp/vpp-api/api.c
+++ b/vpp/vpp-api/api.c
@@ -5097,29 +5097,24 @@ vl_api_lisp_add_del_remote_mapping_t_handler (
         vec_add1 (rlocs, rloc);
     }
 
-    /* TODO Uncomment once https://gerrit.fd.io/r/#/c/1802 is merged and CSIT
-     * is switched to lisp_add_del_adjacency */
-//    if (!mp->is_add) {
-//        vnet_lisp_add_del_adjacency_args_t _a, * a = &_a;
-//        gid_address_copy(&a->deid, deid);
-//        a->is_add = 0;
-//        rv = vnet_lisp_add_del_adjacency (a);
-//    } else {
-//        /* NOTE: for now this works as a static remote mapping, i.e.,
-//         * not authoritative and ttl infinite. */
-//        rv = vnet_lisp_add_del_mapping (deid, rlocs, mp->action, 0, ~0,
-//                                        mp->is_add, 0);
-//    }
-
-    /* TODO: remove once the above is merged */
-    vnet_lisp_add_del_adjacency_args_t _a, * a = &_a;
-    a->is_add = mp->is_add;
-    a->authoritative = 0;
-    a->action = mp->action;
-    a->locators = rlocs;
-    gid_address_copy(&a->seid, seid);
-    gid_address_copy(&a->deid, deid);
-    rv = vnet_lisp_add_del_adjacency (a);
+    if (!mp->is_add) {
+        vnet_lisp_add_del_adjacency_args_t _a, * a = &_a;
+        gid_address_copy(&a->deid, deid);
+        a->is_add = 0;
+        rv = vnet_lisp_add_del_adjacency (a);
+    } else {
+        /* NOTE: for now this works as a static remote mapping, i.e.,
+         * not authoritative and ttl infinite. */
+        rv = vnet_lisp_add_del_mapping (deid, rlocs, mp->action, 0, ~0,
+                                        mp->is_add, 0);
+
+        /* TODO remove once CSIT switched to lisp_add_del_adjacency */
+        vnet_lisp_add_del_adjacency_args_t _a, * a = &_a;
+        gid_address_copy(&a->seid, seid);
+        gid_address_copy(&a->deid, deid);
+        a->is_add = 1;
+        vnet_lisp_add_del_adjacency (a);
+    }
 
     if (mp->del_all)
       vnet_lisp_clear_all_remote_adjacencies ();
@@ -5133,8 +5128,6 @@ static void
 vl_api_lisp_add_del_adjacency_t_handler (
     vl_api_lisp_add_del_adjacency_t *mp)
 {
-    u32 i;
-    locator_t rloc;
     vl_api_lisp_add_del_adjacency_reply_t * rmp;
     vnet_lisp_add_del_adjacency_args_t _a, * a = &_a;
 
@@ -5178,29 +5171,9 @@ vl_api_lisp_add_del_adjacency_t_handler (
         goto send_reply;
       }
 
-    for (i = 0; i < mp->rloc_num; i++) {
-        rloc_t * r = &((rloc_t *) mp->rlocs)[i];
-        memset(&rloc, 0, sizeof(rloc));
-        ip_address_set(&gid_address_ip(&rloc.address), &r->addr,
-                       r->is_ip4 ? IP4 : IP6);
-        gid_address_ippref_len(&rloc.address) = r->is_ip4 ? 32: 128;
-        gid_address_type(&rloc.address) = GID_ADDR_IP_PREFIX;
-        rloc.priority = r->priority;
-        rloc.weight = r->weight;
-        vec_add1 (a->locators, rloc);
-    }
-
-    a->action = mp->action;
     a->is_add = mp->is_add;
-
-    /* NOTE: the remote mapping is static, i.e.,  not authoritative and
-     * ttl is infinite. */
-    a->authoritative = 0;
-    a->ttl = ~0;
-
     rv = vnet_lisp_add_del_adjacency (a);
 
-    vec_free (a->locators);
 send_reply:
     REPLY_MACRO(VL_API_LISP_ADD_DEL_ADJACENCY_REPLY);
 }
@@ -5480,6 +5453,23 @@ vl_api_lisp_map_resolver_dump_t_handler (
 
 }
 
+static void
+send_eid_table_map_pair (hash_pair_t * p,
+                         unix_shared_memory_queue_t * q,
+                         u32 context)
+{
+    vl_api_lisp_eid_table_map_details_t * rmp = NULL;
+
+    rmp = vl_msg_api_alloc (sizeof (*rmp));
+    memset (rmp, 0, sizeof (*rmp));
+    rmp->_vl_msg_id = ntohs(VL_API_LISP_EID_TABLE_MAP_DETAILS);
+
+    rmp->vni = clib_host_to_net_u32 (p->key);
+    rmp->vrf = clib_host_to_net_u32 (p->value[0]);
+    rmp->context = context;
+    vl_msg_api_send_shmem (q, (u8 *)&rmp);
+}
+
 static void
 vl_api_lisp_eid_table_map_dump_t_handler (
     vl_api_lisp_eid_table_map_dump_t *mp)
@@ -5493,12 +5483,7 @@ vl_api_lisp_eid_table_map_dump_t_handler (
         return;
     }
     hash_foreach_pair (p, lcm->table_id_by_vni, {
-        vl_api_lisp_eid_table_map_details_t * rmp = NULL;
-        memset (rmp, 0, sizeof (*rmp));
-        rmp->_vl_msg_id = ntohs(VL_API_LISP_EID_TABLE_MAP_DETAILS);
-        rmp->vni = p->key;
-        rmp->vrf = p->value[0];
-        rmp->context = mp->context;
+        send_eid_table_map_pair (p, q, mp->context);
     });
 }
 
@@ -5746,7 +5731,7 @@ static void vl_api_ipsec_spd_add_del_entry_t_handler
     p.is_outbound = mp->is_outbound;
     p.is_ipv6 = mp->is_ipv6;
 
-    if (mp->is_ipv6) {
+    if (mp->is_ipv6 || mp->is_ip_any) {
         clib_memcpy(&p.raddr.start, mp->remote_address_start, 16);
         clib_memcpy(&p.raddr.stop, mp->remote_address_stop, 16);
         clib_memcpy(&p.laddr.start, mp->local_address_start, 16);
@@ -6355,6 +6340,12 @@ vl_api_policer_add_del_t_handler
     cfg.rb.kbps.eir_kbps = mp->eir;
     cfg.rb.kbps.cb_bytes = mp->cb;
     cfg.rb.kbps.eb_bytes = mp->eb;
+    cfg.conform_action.action_type = mp->conform_action_type;
+    cfg.conform_action.dscp = mp->conform_dscp;
+    cfg.exceed_action.action_type = mp->exceed_action_type;
+    cfg.exceed_action.dscp = mp->exceed_dscp;
+    cfg.violate_action.action_type = mp->violate_action_type;
+    cfg.violate_action.dscp = mp->violate_dscp;
 
     error = policer_add_del(vm, name, &cfg, mp->is_add);
 
@@ -6384,6 +6375,12 @@ send_policer_details (u8 *name,
     mp->rate_type = config->rate_type;
     mp->round_type = config->rnd_type;
     mp->type = config->rfc;
+    mp->conform_action_type = config->conform_action.action_type;
+    mp->conform_dscp = config->conform_action.dscp;
+    mp->exceed_action_type = config->exceed_action.action_type;
+    mp->exceed_dscp = config->exceed_action.dscp;
+    mp->violate_action_type = config->violate_action.action_type;
+    mp->violate_dscp = config->violate_action.dscp;
     mp->single_rate = templ->single_rate ? 1 : 0;
     mp->color_aware = templ->color_aware ? 1 : 0;
     mp->scale = htonl(templ->scale);