Add LISP RTR support

Change-Id: I8a3770f8f1cd1fde6765b81d35aacaaf4ff98b82
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>

7 files changed, 392 insertions, 44 deletions

diff --git a/vnet/vnet/lisp-cp/control.c b/vnet/vnet/lisp-cp/control.c
index 2d3c2d7471b..b7c5dae908a 100644
--- a/vnet/vnet/lisp-cp/control.c
+++ b/vnet/vnet/lisp-cp/control.c
@@ -36,14 +36,16 @@ vnet_lisp_add_del_mapping (vnet_lisp_add_del_mapping_args_t * a,
 {
   lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
   u32 mi, * map_indexp, map_index, i;
-  mapping_t * m;
+  mapping_t * m, * old_map;
   u32 ** eid_indexes;
 
   mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, &a->deid);
+  old_map = mi != ~0 ? pool_elt_at_index (lcm->mapping_pool, mi) : 0;
   if (a->is_add)
     {
       /* TODO check if overwriting and take appropriate actions */
-      if (mi != GID_LOOKUP_MISS)
+      if (mi != GID_LOOKUP_MISS && !gid_address_cmp (&old_map->eid,
+                                                     &a->deid))
         {
           clib_warning("eid %U found in the eid-table", format_ip_address,
                        &a->deid);
@@ -54,6 +56,7 @@ vnet_lisp_add_del_mapping (vnet_lisp_add_del_mapping_args_t * a,
       m->eid = a->deid;
       m->locator_set_index = a->locator_set_index;
       m->ttl = a->ttl;
+      m->action = a->action;
       m->local = a->local;
 
       map_index = m - lcm->mapping_pool;
@@ -185,6 +188,7 @@ vnet_lisp_add_del_local_mapping (vnet_lisp_add_del_mapping_args_t * a,
           ai->vni = vni;
           ai->table_id = table_id[0];
           vnet_lisp_gpe_add_del_iface (ai, 0);
+          hash_unset (lcm->dp_if_refcount_by_vni, vni);
         }
     }
 
@@ -202,7 +206,7 @@ lisp_add_del_local_eid_command_fn (vlib_main_t * vm, unformat_input_t * input,
   ip_prefix_t * prefp = &gid_address_ippref(&eid);
   gid_address_t * eids = 0;
   clib_error_t * error = 0;
-  u8 * locator_set_name;
+  u8 * locator_set_name = 0;
   u32 locator_set_index = 0, map_index = 0;
   uword * p;
   vnet_lisp_add_del_mapping_args_t _a, * a = &_a;
@@ -250,6 +254,8 @@ lisp_add_del_local_eid_command_fn (vlib_main_t * vm, unformat_input_t * input,
   vnet_lisp_add_del_local_mapping (a, &map_index);
  done:
   vec_free(eids);
+  if (locator_set_name)
+    vec_free (locator_set_name);
   return error;
 }
 
@@ -259,6 +265,97 @@ VLIB_CLI_COMMAND (lisp_add_del_local_eid_command) = {
     .function = lisp_add_del_local_eid_command_fn,
 };
 
+static int
+lisp_add_del_negative_static_mapping (gid_address_t * deid,
+    vnet_lisp_add_del_locator_set_args_t * ls, u8 action, u8 is_add)
+{
+  uword * p;
+  mapping_t * map;
+  u32 mi = ~0;
+  lisp_cp_main_t * lcm = vnet_lisp_cp_get_main ();
+  uword * refc;
+  vnet_lisp_add_del_mapping_args_t _dm_args, * dm_args = &_dm_args;
+  int rv = 0;
+  u32 ls_index = 0, dst_map_index;
+  vnet_lisp_gpe_add_del_iface_args_t _ai, *ai = &_ai;
+
+  memset (dm_args, 0, sizeof (dm_args[0]));
+  u32 vni = gid_address_vni (deid);
+  refc = hash_get (lcm->dp_if_refcount_by_vni, vni);
+
+  p = hash_get (lcm->table_id_by_vni, vni);
+  if (!p)
+    {
+      clib_warning ("vni %d not associated to a vrf!", vni);
+      return VNET_API_ERROR_INVALID_VALUE;
+    }
+
+  if (is_add)
+    {
+      vnet_lisp_add_del_locator_set (ls, &ls_index);
+      /* add mapping */
+      gid_address_copy (&dm_args->deid, deid);
+      dm_args->is_add = 1;
+      dm_args->action = action;
+      dm_args->locator_set_index = ls_index;
+
+      /* create interface or update refcount */
+      if (!refc)
+        {
+          vnet_lisp_gpe_add_del_iface_args_t _ai, *ai = &_ai;
+          ai->is_add = 1;
+          ai->vni = vni;
+          ai->table_id = p[0];
+          vnet_lisp_gpe_add_del_iface (ai, 0);
+
+          /* counts the number of eids in a vni that use the interface */
+          hash_set (lcm->dp_if_refcount_by_vni, vni, 1);
+        }
+      else
+        refc[0]++;
+
+      rv = vnet_lisp_add_del_local_mapping (dm_args, &dst_map_index);
+      if (!rv)
+        add_fwd_entry (lcm, lcm->pitr_map_index, dst_map_index);
+    }
+  else
+    {
+      mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, deid);
+      if ((u32)~0 == mi)
+        {
+          clib_warning ("eid %U marked for removal, but not found in "
+                        "map-cache!", unformat_gid_address, deid);
+          return VNET_API_ERROR_INVALID_VALUE;
+        }
+
+      /* delete forwarding entry */
+      del_fwd_entry (lcm, 0, mi);
+
+      dm_args->is_add = 0;
+      gid_address_copy (&dm_args->deid, deid);
+      map = pool_elt_at_index (lcm->mapping_pool, mi);
+      dm_args->locator_set_index = map->locator_set_index;
+
+      /* delete mapping associated to fwd entry */
+      vnet_lisp_add_del_mapping (dm_args, 0);
+
+      refc = hash_get (lcm->dp_if_refcount_by_vni, vni);
+      ASSERT(refc != 0);
+      refc[0]--;
+
+      /* remove iface if needed */
+      if (refc[0] == 0)
+        {
+          ai->is_add = 0;
+          ai->vni = vni;
+          ai->table_id = p[0];
+          vnet_lisp_gpe_add_del_iface (ai, 0);
+          hash_unset (lcm->dp_if_refcount_by_vni, vni);
+        }
+    }
+  return rv;
+}
+
 /**
  * Adds/removes/updates static remote mapping.
  *
@@ -301,6 +398,14 @@ vnet_lisp_add_del_remote_mapping (gid_address_t * deid, gid_address_t * seid,
   /* new mapping */
   if ((u32)~0 == mi)
     {
+      ls->is_add = 1;
+      ls->index = ~0;
+
+      /* process a negative mapping */
+      if (0 == vec_len (rlocs))
+        return lisp_add_del_negative_static_mapping (deid, ls,
+                                                     action, is_add);
+
       if ((u32)~0 == src_map_index)
         {
           clib_warning ("seid %U not found!", format_gid_address, seid);
@@ -314,8 +419,6 @@ vnet_lisp_add_del_remote_mapping (gid_address_t * deid, gid_address_t * seid,
           goto done;
         }
 
-      ls->is_add = 1;
-      ls->index = ~0;
       vnet_lisp_add_del_locator_set (ls, &ls_index);
 
       /* add mapping */
@@ -403,7 +506,8 @@ lisp_add_del_remote_mapping_command_fn (vlib_main_t * vm,
   ip_address_t rloc, * rlocs = 0;
   ip_prefix_t * deid_ippref, * seid_ippref;
   gid_address_t seid, deid;
-  u8 deid_set = 0, seid_set = 0;
+  u8 deid_set = 0;
+  u8 * s = 0;
   u32 vni, action = ~0;
 
   /* Get a line of input. */
@@ -437,11 +541,25 @@ lisp_add_del_remote_mapping_command_fn (vlib_main_t * vm,
         }
       else if (unformat (line_input, "seid %U",
                          unformat_ip_prefix, seid_ippref))
-        seid_set = 1;
+        ;
       else if (unformat (line_input, "rloc %U", unformat_ip_address, &rloc))
         vec_add1 (rlocs, rloc);
-      else if (unformat (line_input, "action %d", &action))
-        ;
+      else if (unformat (line_input, "action %s", &s))
+        {
+          if (!strcmp ((char *)s, "no-action"))
+            action = ACTION_NONE;
+          if (!strcmp ((char *)s, "natively-forward"))
+            action = ACTION_NATIVELY_FORWARDED;
+          if (!strcmp ((char *)s, "send-map-request"))
+            action = ACTION_SEND_MAP_REQUEST;
+          else if (!strcmp ((char *)s, "drop"))
+            action = ACTION_DROP;
+          else
+            {
+              clib_warning ("invalid action: '%s'", s);
+              goto done;
+            }
+        }
       else
         {
           clib_warning ("parse error");
@@ -449,13 +567,7 @@ lisp_add_del_remote_mapping_command_fn (vlib_main_t * vm,
         }
     }
 
-  if (is_add && (!deid_set || !seid_set))
-    {
-      clib_warning ("missing paramete(s)!");
-      goto done;
-    }
-
-  if (!is_add && !deid_set)
+  if (!deid_set)
     {
       clib_warning ("missing deid!");
       goto done;
@@ -485,16 +597,99 @@ lisp_add_del_remote_mapping_command_fn (vlib_main_t * vm,
 
 done:
   unformat_free (line_input);
+  if (s)
+    vec_free (s);
   return error;
 }
 
 VLIB_CLI_COMMAND (lisp_add_del_remote_mapping_command) = {
     .path = "lisp remote-mapping",
-    .short_help = "lisp remote-mapping add|del vni <vni> deid <dest-eid> "
-     "seid <src-eid> rloc <dst-locator> [rloc <dst-locator> ... ]",
+    .short_help = "lisp remote-mapping add|del vni <vni>"
+     "deid <dest-eid> seid <src-eid> [action <no-action|natively-forward|"
+     "send-map-request|drop>] rloc <dst-locator> [rloc <dst-locator> ... ]",
     .function = lisp_add_del_remote_mapping_command_fn,
 };
 
+int
+vnet_lisp_pitr_set_locator_set (u8 * locator_set_name, u8 is_add)
+{
+  lisp_cp_main_t * lcm = vnet_lisp_cp_get_main ();
+  u32 locator_set_index = ~0;
+  mapping_t * m;
+  uword * p;
+
+  p = hash_get_mem (lcm->locator_set_index_by_name, locator_set_name);
+  if (!p)
+    {
+      clib_warning ("locator-set %v doesn't exist", locator_set_name);
+      return -1;
+    }
+  locator_set_index = p[0];
+
+  if (is_add)
+    {
+      pool_get (lcm->mapping_pool, m);
+      m->locator_set_index = locator_set_index;
+      m->local = 1;
+      lcm->pitr_map_index = m - lcm->mapping_pool;
+
+      /* enable pitr mode */
+      lcm->lisp_pitr = 1;
+    }
+  else
+    {
+      /* remove pitr mapping */
+      pool_put_index (lcm->mapping_pool, lcm->pitr_map_index);
+
+      /* disable pitr mode */
+      lcm->lisp_pitr = 0;
+    }
+  return 0;
+}
+
+static clib_error_t *
+lisp_pitr_set_locator_set_command_fn (vlib_main_t * vm,
+                                      unformat_input_t * input,
+                                      vlib_cli_command_t * cmd)
+{
+  u8 locator_name_set = 0;
+  u8 * locator_set_name = 0;
+  u8 is_add = 1;
+  unformat_input_t _line_input, * line_input = &_line_input;
+
+  /* Get a line of input. */
+  if (! unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "ls %_%v%_", &locator_set_name))
+        locator_name_set = 1;
+      else if (unformat (line_input, "disable"))
+        is_add = 0;
+      else
+        return clib_error_return (0, "parse error");
+    }
+
+  if (!locator_name_set)
+    {
+      clib_warning ("No locator set specified!");
+      goto done;
+    }
+  vnet_lisp_pitr_set_locator_set (locator_set_name, is_add);
+
+done:
+  if (locator_set_name)
+    vec_free (locator_set_name);
+  return 0;
+}
+
+VLIB_CLI_COMMAND (lisp_pitr_set_locator_set_command) = {
+    .path = "lisp pitr",
+    .short_help = "lisp pitr [disable] ls <locator-set-name>",
+    .function = lisp_pitr_set_locator_set_command_fn,
+};
+
 static clib_error_t *
 lisp_show_local_eid_table_command_fn (vlib_main_t * vm,
                                       unformat_input_t * input,
@@ -1090,7 +1285,8 @@ lisp_add_del_locator_set_command_fn (vlib_main_t * vm, unformat_input_t * input,
 
  done:
   vec_free(locators);
-  vec_free(locator_set_name);
+  if (locator_set_name)
+    vec_free (locator_set_name);
   return error;
 }
 
@@ -1469,22 +1665,31 @@ send_encapsulated_map_request (vlib_main_t * vm, lisp_cp_main_t *lcm,
   ip_address_t mr_ip, sloc;
 
   /* get locator-set for seid */
-  map_index = gid_dictionary_lookup (&lcm->mapping_index_by_gid, seid);
-  if (map_index == ~0)
+  if (!lcm->lisp_pitr)
     {
-      clib_warning("No local mapping found in eid-table for %U!",
-                   format_gid_address, seid);
-      return;
-    }
+      map_index = gid_dictionary_lookup (&lcm->mapping_index_by_gid, seid);
+      if (map_index == ~0)
+        {
+          clib_warning("No local mapping found in eid-table for %U!",
+                       format_gid_address, seid);
+          return;
+        }
 
-  map = pool_elt_at_index (lcm->mapping_pool, map_index);
+      map = pool_elt_at_index (lcm->mapping_pool, map_index);
 
-  if (!map->local)
+      if (!map->local)
+        {
+          clib_warning("Mapping found for src eid %U is not marked as local!",
+                       format_gid_address, seid);
+          return;
+        }
+    }
+  else
     {
-      clib_warning("Mapping found for src eid %U is not marked as local!",
-                   format_gid_address, seid);
-      return;
+      map_index = lcm->pitr_map_index;
+      map = pool_elt_at_index (lcm->mapping_pool, lcm->pitr_map_index);
     }
+
   loc_set = pool_elt_at_index (lcm->locator_set_pool, map->locator_set_index);
 
   /* get local iface ip to use in map-request XXX fib 0 for now*/
@@ -1593,10 +1798,23 @@ lisp_cp_lookup (vlib_main_t * vm, vlib_node_runtime_t * node,
           di = gid_dictionary_lookup (&lcm->mapping_index_by_gid, &dst);
           if (~0 != di)
             {
-              si =  gid_dictionary_lookup (&lcm->mapping_index_by_gid, &src);
-              if (~0 != si)
+              mapping_t * m =  vec_elt_at_index (lcm->mapping_pool, di);
+              /* send a map-request also in case of negative mapping entry
+                with corresponding action */
+              if (m->action == ACTION_SEND_MAP_REQUEST)
                 {
-                  add_fwd_entry (lcm, si, di);
+                  /* send map-request */
+                  send_encapsulated_map_request (vm, lcm, &src, &dst, 0);
+                  pkts_mapped++;
+                }
+              else
+                {
+                  si =  gid_dictionary_lookup (&lcm->mapping_index_by_gid,
+                                               &src);
+                  if (~0 != si)
+                    {
+                      add_fwd_entry (lcm, si, di);
+                    }
                 }
             }
           else
@@ -1869,6 +2087,7 @@ compare_locators (lisp_cp_main_t *lcm, u32 * old_ls_indexes,
 void
 process_map_reply (lisp_cp_main_t * lcm, vlib_buffer_t * b)
 {
+  mapping_t * old_map;
   locator_t * loc;
   u32 len = 0, i, ls_index = 0;
   void * h;
@@ -1919,14 +2138,13 @@ process_map_reply (lisp_cp_main_t * lcm, vlib_buffer_t * b)
         }
 
       mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, &m_args->deid);
+      old_map = mi != ~0 ? pool_elt_at_index(lcm->mapping_pool, mi) : 0;
 
       /* if mapping already exists, decide if locators (and forwarding) should
        * be updated and be done */
-      if (mi != ~0)
+      if (old_map != 0 && !gid_address_cmp (&old_map->eid, &m_args->deid))
         {
-          mapping_t * old_map;
           locator_set_t * old_ls;
-          old_map = pool_elt_at_index(lcm->mapping_pool, mi);
 
           /* update mapping attributes */
           old_map->action = m_args->action;
diff --git a/vnet/vnet/lisp-cp/control.h b/vnet/vnet/lisp-cp/control.h
index ecab1dba091..6f70829f011 100644
--- a/vnet/vnet/lisp-cp/control.h
+++ b/vnet/vnet/lisp-cp/control.h
@@ -100,6 +100,12 @@ typedef struct
   /* Number of src prefixes in a vni that use an interface */
   uword * dp_if_refcount_by_vni;
 
+  /* Proxy ETR map index */
+  u32 pitr_map_index;
+
+  /* LISP PITR mode */
+  u8 lisp_pitr;
+
   /* commodity */
   ip4_main_t * im4;
   ip6_main_t * im6;
@@ -179,4 +185,7 @@ int
 vnet_lisp_add_del_remote_mapping (gid_address_t * deid, gid_address_t * seid,
                                   ip_address_t * dlocs, u8 action, u8 is_add);
 
+int
+vnet_lisp_pitr_set_locator_set (u8 * locator_set_name, u8 is_add);
+
 #endif /* VNET_CONTROL_H_ */
diff --git a/vnet/vnet/lisp-cp/lisp_cp_messages.h b/vnet/vnet/lisp-cp/lisp_cp_messages.h
index 742e7fa0a09..69f6baa3ad8 100644
--- a/vnet/vnet/lisp-cp/lisp_cp_messages.h
+++ b/vnet/vnet/lisp-cp/lisp_cp_messages.h
@@ -416,12 +416,12 @@ void mapping_record_init_hdr(mapping_record_hdr_t *h);
 #define MAP_REC_EID(h) (u8 *)(h)+sizeof(mapping_record_hdr_t)
 #define MAP_REC_VERSION(h) (h)->version_hi << 8 | (h)->version_low
 
-typedef enum lisp_actions
+typedef enum
 {
-  ACT_NO_ACTION = 0,
-  ACT_NATIVE_FWD,
-  ACT_SEND_MREQ,
-  ACT_DROP
+  ACTION_NONE,
+  ACTION_NATIVELY_FORWARDED,
+  ACTION_SEND_MAP_REQUEST,
+  ACTION_DROP
 } lisp_action_e;
 
 typedef enum lisp_authoritative
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe.c b/vnet/vnet/lisp-gpe/lisp_gpe.c
index c00a9cf43b6..35e16bbcf7c 100644
--- a/vnet/vnet/lisp-gpe/lisp_gpe.c
+++ b/vnet/vnet/lisp-gpe/lisp_gpe.c
@@ -195,7 +195,14 @@ add_del_negative_fwd_entry (lisp_gpe_main_t * lgm,
       /* TODO check if route/next-hop for eid exists in fib and add
        * more specific for the eid with the next-hop found */
     case SEND_MAP_REQUEST:
-      /* TODO insert tunnel that always sends map-request */
+      /* insert tunnel that always sends map-request */
+      adj.rewrite_header.sw_if_index = ~0;
+      adj.lookup_next_index = (u32) (ip_prefix_version(dpref) == IP4) ?
+                                     LGPE_IP4_LOOKUP_NEXT_LISP_CP_LOOKUP:
+                                     LGPE_IP6_LOOKUP_NEXT_LISP_CP_LOOKUP;
+      /* add/delete route for prefix */
+      return ip_sd_fib_add_del_route (lgm, dpref, spref, a->table_id, &adj,
+                                      a->is_add);
     case DROP:
       /* for drop fwd entries, just add route, no need to add encap tunnel */
       adj.lookup_next_index =  (u32) (ip_prefix_version(dpref) == IP4 ?
@@ -204,7 +211,6 @@ add_del_negative_fwd_entry (lisp_gpe_main_t * lgm,
       /* add/delete route for prefix */
       return ip_sd_fib_add_del_route (lgm, dpref, spref, a->table_id, &adj,
                                       a->is_add);
-      break;
     default:
       return -1;
     }
@@ -546,6 +552,27 @@ VLIB_CLI_COMMAND (enable_disable_lisp_gpe_command, static) = {
   .function = lisp_gpe_enable_disable_command_fn,
 };
 
+static clib_error_t *
+lisp_show_iface_command_fn (vlib_main_t * vm,
+                            unformat_input_t * input,
+                            vlib_cli_command_t * cmd)
+{
+  lisp_gpe_main_t * lgm = &lisp_gpe_main;
+  hash_pair_t * p;
+
+  vlib_cli_output (vm, "%=10s%=12s", "vrf", "hw_if_index");
+  hash_foreach_pair (p, lgm->lisp_gpe_hw_if_index_by_table_id, ({
+    vlib_cli_output (vm, "%=10d%=10d", p->key, p->value[0]);
+  }));
+  return 0;
+}
+
+VLIB_CLI_COMMAND (lisp_show_iface_command) = {
+    .path = "show lisp gpe interface",
+    .short_help = "show lisp gpe interface",
+    .function = lisp_show_iface_command_fn,
+};
+
 clib_error_t *
 lisp_gpe_init (vlib_main_t *vm)
 {
diff --git a/vpp-api-test/vat/api_format.c b/vpp-api-test/vat/api_format.c
index 27d3f9a18c8..3fc56d700e6 100644
--- a/vpp-api-test/vat/api_format.c
+++ b/vpp-api-test/vat/api_format.c
@@ -2351,6 +2351,7 @@ _(lisp_add_del_map_resolver_reply)                      \
 _(lisp_gpe_enable_disable_reply)                        \
 _(lisp_gpe_add_del_iface_reply)                         \
 _(lisp_enable_disable_reply)                            \
+_(lisp_pitr_set_locator_set_reply)                      \
 _(vxlan_gpe_add_del_tunnel_reply)			\
 _(af_packet_create_reply)                               \
 _(af_packet_delete_reply)                               \
@@ -2528,6 +2529,7 @@ _(LISP_GPE_ADD_DEL_FWD_ENTRY_REPLY, lisp_gpe_add_del_fwd_entry_reply)   \
 _(LISP_ADD_DEL_MAP_RESOLVER_REPLY, lisp_add_del_map_resolver_reply)     \
 _(LISP_GPE_ENABLE_DISABLE_REPLY, lisp_gpe_enable_disable_reply)         \
 _(LISP_ENABLE_DISABLE_REPLY, lisp_enable_disable_reply)                 \
+_(LISP_PITR_SET_LOCATOR_SET_REPLY, lisp_pitr_set_locator_set_reply)     \
 _(LISP_GPE_ADD_DEL_IFACE_REPLY, lisp_gpe_add_del_iface_reply)           \
 _(LISP_LOCATOR_SET_DETAILS, lisp_locator_set_details)                   \
 _(LISP_LOCAL_EID_TABLE_DETAILS, lisp_local_eid_table_details)           \
@@ -9999,6 +10001,58 @@ typedef CLIB_PACKED(struct
 }) rloc_t;
 
 /**
+ * Enable/disable LISP proxy ITR.
+ *
+ * @param vam vpp API test context
+ * @return return code
+ */
+static int
+api_lisp_pitr_set_locator_set (vat_main_t * vam)
+{
+  f64 timeout = ~0;
+  u8 ls_name_set = 0;
+  unformat_input_t * input = vam->input;
+  vl_api_lisp_pitr_set_locator_set_t * mp;
+  u8 is_add = 1;
+  u8 * ls_name = 0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "del"))
+        is_add = 0;
+      else if (unformat (input, "locator-set %s", &ls_name))
+        ls_name_set = 1;
+      else
+        {
+          errmsg ("parse error '%U'", format_unformat_error, input);
+          return -99;
+        }
+    }
+
+  if (!ls_name_set)
+    {
+      errmsg ("locator-set name not set!");
+      return -99;
+    }
+
+  M(LISP_PITR_SET_LOCATOR_SET, lisp_pitr_set_locator_set);
+
+  mp->is_add = is_add;
+  clib_memcpy (mp->ls_name, ls_name, vec_len (ls_name));
+  vec_free (ls_name);
+
+  /* send */
+  S;
+
+  /* wait for reply */
+  W;
+
+  /* notreached*/
+  return 0;
+}
+
+/**
  * Add/del remote mapping from LISP control plane and updates
  * forwarding entries in data-plane accordingly.
  *
@@ -11057,9 +11111,11 @@ _(lisp_add_del_map_resolver, "<ip4|6-addr> [del]")                      \
 _(lisp_gpe_enable_disable, "enable|disable")                            \
 _(lisp_enable_disable, "enable|disable")                                \
 _(lisp_gpe_add_del_iface, "up|down")                                    \
-_(lisp_add_del_remote_mapping, "add|del vni <vni> deid <dest-eid> seid" \
+_(lisp_add_del_remote_mapping, "add|del vni <vni> table-id <id> "       \
+                               "deid <dest-eid> seid"                   \
                                " <src-eid> rloc <locator> "             \
                                "[rloc <loc> ... ]")                     \
+_(lisp_pitr_set_locator_set, "locator-set <loc-set-name> | del")        \
 _(lisp_locator_set_dump, "")                                            \
 _(lisp_local_eid_table_dump, "")                                        \
 _(lisp_gpe_tunnel_dump, "")                                             \
diff --git a/vpp/api/api.c b/vpp/api/api.c
index d1c45fd3b27..3b56d1c3746 100644
--- a/vpp/api/api.c
+++ b/vpp/api/api.c
@@ -329,6 +329,7 @@ _(LISP_GPE_ENABLE_DISABLE, lisp_gpe_enable_disable)                     \
 _(LISP_ENABLE_DISABLE, lisp_enable_disable)                             \
 _(LISP_GPE_ADD_DEL_IFACE, lisp_gpe_add_del_iface)                       \
 _(LISP_ADD_DEL_REMOTE_MAPPING, lisp_add_del_remote_mapping)             \
+_(LISP_PITR_SET_LOCATOR_SET, lisp_pitr_set_locator_set)                 \
 _(LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump)                         \
 _(LISP_LOCAL_EID_TABLE_DUMP, lisp_local_eid_table_dump)                 \
 _(LISP_GPE_TUNNEL_DUMP, lisp_gpe_tunnel_dump)                           \
@@ -4830,6 +4831,21 @@ vl_api_lisp_gpe_add_del_iface_t_handler(
     REPLY_MACRO(VL_API_LISP_GPE_ADD_DEL_IFACE_REPLY);
 }
 
+static void
+vl_api_lisp_pitr_set_locator_set_t_handler(
+  vl_api_lisp_pitr_set_locator_set_t *mp)
+{
+    vl_api_lisp_pitr_set_locator_set_reply_t *rmp;
+    int rv = 0;
+    u8 * ls_name = 0;
+
+    ls_name = format (0, "%s", mp->ls_name);
+    rv = vnet_lisp_pitr_set_locator_set (ls_name, mp->is_add);
+    vec_free (ls_name);
+
+    REPLY_MACRO(VL_API_LISP_PITR_SET_LOCATOR_SET_REPLY);
+}
+
 /** Used for transferring locators via VPP API */
 typedef CLIB_PACKED(struct
 {
diff --git a/vpp/api/vpe.api b/vpp/api/vpe.api
index 983b414e451..2a827d12188 100644
--- a/vpp/api/vpe.api
+++ b/vpp/api/vpe.api
@@ -2325,6 +2325,28 @@ define lisp_gpe_add_del_iface_reply {
     i32 retval;
 };
 
+/** \brief configure or disable LISP PITR node
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param ls_name - locator set name
+    @param is_add - add locator set if non-zero, else disable pitr
+*/
+define lisp_pitr_set_locator_set {
+    u32 client_index;
+    u32 context;
+    u8 is_add;
+    u8 ls_name[64];
+};
+
+/** \brief Reply for lisp_pitr_set_locator_set
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define lisp_pitr_set_locator_set_reply {
+    u32 context;
+    i32 retval;
+};
+
 /** \brief add or delete remote static mapping
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request