Python3: resources and libraries
[csit.git] / resources / libraries / python / LispSetup.py
index 14f9929..666b6e6 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2016-2019 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
 
 """Library to set up Lisp in topology."""
 
+from ipaddress import ip_address
+
+from resources.libraries.python.L2Util import L2Util
+from resources.libraries.python.PapiExecutor import PapiSocketExecutor
 from resources.libraries.python.topology import NodeType
-from resources.libraries.python.VatExecutor import VatExecutor
 
 
-class LispStatus(object):
+class LispStatus:
     """Class for lisp API."""
 
-    def __init__(self):
-        pass
-
     @staticmethod
     def vpp_lisp_enable_disable(node, state):
         """Enable/Disable lisp in the VPP node in topology.
@@ -32,30 +32,31 @@ class LispStatus(object):
         :type node: dict
         :type state: str
         """
+        args = dict(is_en=0 if state == u"disable" else 1)
 
-        VatExecutor.cmd_from_template(node,
-                                      'lisp/lisp_status.vat',
-                                      state=state)
+        cmd = u"lisp_enable_disable"
+        err_msg = f"Failed to set LISP status on host {node[u'host']}"
 
+        with PapiSocketExecutor(node) as papi_exec:
+            papi_exec.add(cmd, **args).get_reply(err_msg)
 
-class LispRemoteMapping(object):
+class LispRemoteMapping:
     """Class for lisp remote mapping API."""
 
-    def __init__(self):
-        pass
-
     @staticmethod
-    def vpp_add_lisp_remote_mapping(node, vni, deid, deid_prefix, seid,
-                                    seid_prefix, rloc):
+    def vpp_add_lisp_remote_mapping(
+            node, vni, deid, deid_prefix, seid, seid_prefix, rloc,
+            is_mac=False):
         """Add lisp remote mapping on the VPP node in topology.
 
         :param node: VPP node.
         :param vni: Vni.
         :param deid: Destination eid address.
-        :param deid_predix: Destination eid address prefix_len.
+        :param deid_prefix: Destination eid address prefix_len.
         :param seid: Source eid address.
         :param seid_prefix: Source eid address prefix_len.
         :param rloc: Receiver locator.
+        :param is_mac: Set to True if the deid/seid is MAC address.
         :type node: dict
         :type vni: int
         :type deid: str
@@ -63,26 +64,56 @@ class LispRemoteMapping(object):
         :type seid: str
         :type seid_prefix: int
         :type rloc: str
+        :type is_mac: bool
         """
-
-        VatExecutor.cmd_from_template(node,
-                                      'lisp/add_lisp_remote_mapping.vat',
-                                      vni=vni,
-                                      deid=deid,
-                                      deid_prefix=deid_prefix,
-                                      seid=seid,
-                                      seid_prefix=seid_prefix,
-                                      rloc=rloc)
+        if not is_mac:
+            eid_type = 0 if ip_address(deid).version == 4 else 1
+            eid_packed = ip_address(deid).packed
+            seid_packed = ip_address(seid).packed
+            eid_len = deid_prefix
+            seid_len = seid_prefix
+        else:
+            eid_type = 2
+            eid_packed = L2Util.mac_to_bin(deid)
+            seid_packed = L2Util.mac_to_bin(seid)
+            eid_len = 0
+            seid_len = 0
+
+        rlocs = [
+            dict(
+                is_ip4=1 if ip_address(rloc).version == 4 else 0,
+                addr=ip_address(rloc).packed
+            )
+        ]
+
+        args = dict(
+            is_add=1,
+            is_src_dst=1,
+            vni=int(vni),
+            eid_type=eid_type,
+            eid=eid_packed,
+            eid_len=eid_len,
+            seid=seid_packed,
+            seid_len=seid_len,
+            rloc_num=1,
+            rlocs=rlocs
+        )
+
+        cmd = u"lisp_add_del_remote_mapping"
+        err_msg = f"Failed to add remote mapping on host {node[u'host']}"
+
+        with PapiSocketExecutor(node) as papi_exec:
+            papi_exec.add(cmd, **args).get_reply(err_msg)
 
     @staticmethod
-    def vpp_del_lisp_remote_mapping(node, vni, deid, deid_prefix, seid,
-                                    seid_prefix, rloc):
+    def vpp_del_lisp_remote_mapping(
+            node, vni, deid, deid_prefix, seid, seid_prefix, rloc):
         """Delete lisp remote mapping on the VPP node in topology.
 
         :param node: VPP node.
         :param vni: Vni.
         :param deid: Destination eid address.
-        :param deid_predix: Destination eid address prefix_len.
+        :param deid_prefix: Destination eid address prefix_len.
         :param seid: Source eid address.
         :param seid_prefix: Source eid address prefix_len.
         :param rloc: Receiver locator.
@@ -94,43 +125,190 @@ class LispRemoteMapping(object):
         :type seid_prefix: int
         :type rloc: str
         """
+        # used only with IPs
+        is_mac = False
+
+        if not is_mac:
+            eid_type = 0 if ip_address(deid).version == 4 else 1
+            eid_packed = ip_address(deid).packed
+            seid_packed = ip_address(seid).packed
+            eid_len = deid_prefix
+            seid_len = seid_prefix
+        else:
+            eid_type = 2
+            eid_packed = L2Util.mac_to_bin(deid)
+            seid_packed = L2Util.mac_to_bin(seid)
+            eid_len = 0
+            seid_len = 0
+
+        rlocs = [
+            dict(
+                is_ip4=1 if ip_address(str(rloc)).version == 4 else 0,
+                addr=ip_address(str(rloc)).packed
+            )
+        ]
+
+        args = dict(
+            is_add=0,
+            is_src_dst=1,
+            vni=int(vni),
+            eid_type=eid_type,
+            eid=eid_packed,
+            eid_len=eid_len,
+            seid=seid_packed,
+            seid_len=seid_len,
+            rloc_num=1,
+            rlocs=rlocs
+        )
+
+        cmd = u"lisp_add_del_remote_mapping"
+        err_msg = f"Failed to delete remote mapping on host {node[u'host']}"
+
+        with PapiSocketExecutor(node) as papi_exec:
+            papi_exec.add(cmd, **args).get_reply(err_msg)
+
+class LispAdjacency:
+    """Class for lisp adjacency API."""
 
-        VatExecutor.cmd_from_template(node,
-                                      'lisp/del_lisp_remote_mapping.vat',
-                                      vni=vni,
-                                      deid=deid,
-                                      deid_predix=deid_prefix,
-                                      seid=seid,
-                                      seid_prefix=seid_prefix,
-                                      rloc=rloc)
+    @staticmethod
+    def vpp_add_lisp_adjacency(
+            node, vni, deid, deid_prefix, seid, seid_prefix, is_mac=False):
+        """Add lisp adjacency on the VPP node in topology.
 
+        :param node: VPP node.
+        :param vni: Vni.
+        :param deid: Destination eid address.
+        :param deid_prefix: Destination eid address prefix_len.
+        :param seid: Source eid address.
+        :param seid_prefix: Source eid address prefix_len.
+        :param is_mac: Set to True if the deid/seid is MAC address.
+        :type node: dict
+        :type vni: int
+        :type deid: str
+        :type deid_prefix: int
+        :type seid: str
+        :type seid_prefix: int
+        :type is_mac: bool
+        """
+        if not is_mac:
+            eid_type = 0 if ip_address(deid).version == 4 else 1
+            reid = ip_address(deid).packed
+            leid = ip_address(seid).packed
+            reid_len = deid_prefix
+            leid_len = seid_prefix
+        else:
+            eid_type = 2
+            reid = L2Util.mac_to_bin(deid)
+            leid = L2Util.mac_to_bin(seid)
+            reid_len = 0
+            leid_len = 0
+
+        args = dict(
+            is_add=1,
+            vni=int(vni),
+            eid_type=eid_type,
+            reid=reid,
+            reid_len=reid_len,
+            leid=leid,
+            leid_len=leid_len
+        )
+
+        cmd = u"lisp_add_del_adjacency"
+        err_msg = f"Failed to add lisp adjacency on host {node[u'host']}"
+
+        with PapiSocketExecutor(node) as papi_exec:
+            papi_exec.add(cmd, **args).get_reply(err_msg)
 
-class LispGpeIface(object):
-    """Class for Lisp gpe interface API."""
+    @staticmethod
+    def vpp_del_lisp_adjacency(
+            node, vni, deid, deid_prefix, seid, seid_prefix):
+        """Delete lisp adjacency on the VPP node in topology.
 
-    def __init__(self):
-        pass
+        :param node: VPP node.
+        :param vni: Vni.
+        :param deid: Destination eid address.
+        :param deid_prefix: Destination eid address prefix_len.
+        :param seid: Source eid address.
+        :param seid_prefix: Source eid address prefix_len.
+        :type node: dict
+        :type vni: int
+        :type deid: str
+        :type deid_prefix: int
+        :type seid: str
+        :type seid_prefix: int
+        """
+        # used only with IPs
+        is_mac = False
+
+        if not is_mac:
+            eid_type = 0 if ip_address(deid).version == 4 else 1
+            reid = ip_address(deid).packed
+            leid = ip_address(seid).packed
+            reid_len = deid_prefix
+            leid_len = seid_prefix
+        else:
+            eid_type = 2
+            reid = L2Util.mac_to_bin(deid)
+            leid = L2Util.mac_to_bin(seid)
+            reid_len = 0
+            leid_len = 0
+
+        args = dict(
+            is_add=0,
+            vni=int(vni),
+            eid_type=eid_type,
+            reid=reid,
+            reid_len=reid_len,
+            leid=leid,
+            leid_len=leid_len
+        )
+
+        cmd = u"lisp_add_del_adjacency"
+        err_msg = f"Failed to delete lisp adjacency on host {node[u'host']}"
+
+        with PapiSocketExecutor(node) as papi_exec:
+            papi_exec.add(cmd, **args).get_reply(err_msg)
+
+class LispGpeStatus:
+    """Clas for LISP GPE status manipulation."""
 
     @staticmethod
-    def vpp_lisp_gpe_iface(node, state):
-        """Set lisp gpe interface up or down on the VPP node in topology.
+    def vpp_lisp_gpe_enable_disable(node, state):
+        """Change the state of LISP GPE - enable or disable.
 
         :param node: VPP node.
-        :param state: State of the gpe iface, up or down.
+        :param state: Requested state - enable or disable.
         :type node: dict
         :type state: str
         """
+        args = dict(is_en=0 if state == u"disable" else 1)
 
-        VatExecutor.cmd_from_template(node,
-                                      'lisp/lisp_gpe_iface.vat',
-                                      state=state)
+        cmd = u"gpe_enable_disable"
+        err_msg = f"Failed to set LISP GPE status on host {node[u'host']}"
 
+        with PapiSocketExecutor(node) as papi_exec:
+            papi_exec.add(cmd, **args).get_reply(err_msg)
 
-class LispMapResolver(object):
-    """Class for Lisp map resolver API."""
+class LispGpeForwardEntry:
+    """The functionality needed for these methods is not implemented in VPP
+    (VAT). Bug https://jira.fd.io/browse/VPP-334 was open to cover this issue.
+
+    TODO: Implement when VPP-334 is fixed.
+    """
+
+    @staticmethod
+    def add_lisp_gpe_forward_entry(node, *args):
+        """Not implemented"""
+        # TODO: Implement when VPP-334 is fixed.
+
+    @staticmethod
+    def del_lisp_gpe_forward_entry(node, *args):
+        """Not implemented"""
+        # TODO: Implement when VPP-334 is fixed.
 
-    def __init__(self):
-        pass
+
+class LispMapResolver:
+    """Class for Lisp map resolver API."""
 
     @staticmethod
     def vpp_add_map_resolver(node, map_resolver_ip):
@@ -141,10 +319,17 @@ class LispMapResolver(object):
         :type node: dict
         :type map_resolver_ip: str
         """
+        args = dict(
+            is_add=1,
+            is_ipv6=0 if ip_address(map_resolver_ip).version == 4 else 1,
+            ip_address=ip_address(map_resolver_ip).packed
+        )
+
+        cmd = u"lisp_add_del_map_resolver"
+        err_msg = f"Failed to add map resolver on host {node[u'host']}"
 
-        VatExecutor.cmd_from_template(node,
-                                      'lisp/add_lisp_map_resolver.vat',
-                                      address=map_resolver_ip)
+        with PapiSocketExecutor(node) as papi_exec:
+            papi_exec.add(cmd, **args).get_reply(err_msg)
 
     @staticmethod
     def vpp_del_map_resolver(node, map_resolver_ip):
@@ -155,65 +340,100 @@ class LispMapResolver(object):
         :type node: dict
         :type map_resolver_ip: str
         """
+        args = dict(
+            is_add=0,
+            is_ipv6=0 if ip_address(map_resolver_ip).version == 4 else 1,
+            ip_address=ip_address(map_resolver_ip).packed
+        )
 
-        VatExecutor.cmd_from_template(node,
-                                      'lisp/del_lisp_map_resolver.vat',
-                                      address=map_resolver_ip)
+        cmd = u"lisp_add_del_map_resolver"
+        err_msg = f"Failed to delete map resolver on host {node[u'host']}"
 
+        with PapiSocketExecutor(node) as papi_exec:
+            papi_exec.add(cmd, **args).get_reply(err_msg)
 
-class LispLocalEid(object):
+class LispLocalEid:
     """Class for Lisp local eid API."""
 
-    def __init__(self):
-        pass
-
     @staticmethod
-    def vpp_add_lisp_local_eid(node, locator_set_name, address, prefix_len):
-        """Set lisp eid addres on the VPP node in topology.
+    def vpp_add_lisp_local_eid(
+            node, locator_set_name, vni, eid, prefix_len=None):
+        """Set lisp eid address on the VPP node in topology.
 
         :param node: VPP node.
         :param locator_set_name: Name of the locator_set.
-        :param address: Eid IP address.
-        :param prefix_len: prefix len of the eid IP address.
+        :param vni: vni value.
+        :param eid: Eid value.
+        :param prefix_len: prefix len if the eid is IP address.
         :type node: dict
         :type locator_set_name: str
-        :type address: str
+        :type vni: int
+        :type eid: str
         :type prefix_len: int
         """
-
-        VatExecutor.cmd_from_template(node,
-                                      'lisp/add_lisp_local_eid.vat',
-                                      eid_address=address,
-                                      eid_prefix=prefix_len,
-                                      locator_name=locator_set_name)
+        if prefix_len:
+            eid_type = 0 if ip_address(eid).version == 4 else 1
+            eid_packed = ip_address(eid).packed
+        else:
+            eid_type = 2
+            eid_packed = L2Util.mac_to_bin(eid)
+
+        args = dict(
+            is_add=1,
+            eid_type=eid_type,
+            eid=eid_packed,
+            prefix_len=prefix_len,
+            locator_set_name=locator_set_name,
+            vni=int(vni)
+        )
+
+        cmd = u"lisp_add_del_local_eid"
+        err_msg = f"Failed to add local eid on host {node[u'host']}"
+
+        with PapiSocketExecutor(node) as papi_exec:
+            papi_exec.add(cmd, **args).get_reply(err_msg)
 
     @staticmethod
-    def vpp_del_lisp_local_eid(node, locator_set_name, address, prefix_len):
+    def vpp_del_lisp_local_eid(
+            node, locator_set_name, vni, eid, prefix_len=None):
         """Set lisp eid addres on the VPP node in topology.
 
         :param node: VPP node.
         :param locator_set_name: Name of the locator_set.
-        :param address: Eid IP address.
-        :param prefix_len: prefix len of the eid IP address.
+        :param vni: vni value.
+        :param eid: Eid value.
+        :param prefix_len: prefix len if the eid is IP address.
         :type node: dict
         :type locator_set_name: str
-        :type address: str
+        :type vni: int
+        :type eid: str
         :type prefix_len: int
         """
-
-        VatExecutor.cmd_from_template(node,
-                                      'lisp/del_lisp_local_eid.vat',
-                                      eid_address=address,
-                                      eid_prefix=prefix_len,
-                                      locator_name=locator_set_name)
-
-
-class LispLocator(object):
+        if prefix_len:
+            eid_type = 0 if ip_address(eid).version == 4 else 1
+            eid_packed = ip_address(eid).packed
+        else:
+            eid_type = 2
+            eid_packed = L2Util.mac_to_bin(eid)
+
+        args = dict(
+            is_add=0,
+            eid_type=eid_type,
+            eid=eid_packed,
+            prefix_len=prefix_len,
+            locator_set_name=locator_set_name,
+            vni=int(vni)
+        )
+
+        cmd = u"lisp_add_del_local_eid"
+        err_msg = f"Failed to delete local eid on host {node[u'host']}"
+
+        with PapiSocketExecutor(node) as papi_exec:
+            papi_exec.add(cmd, **args).get_reply(err_msg)
+
+class LispLocator:
     """Class for the Lisp Locator API."""
 
-    def __init__(self):
-        pass
-
     @staticmethod
     def vpp_add_lisp_locator(node, locator_name, sw_if_index, priority, weight):
         """Set lisp locator on the VPP node in topology.
@@ -230,12 +450,19 @@ class LispLocator(object):
         :type weight: int
         """
 
-        VatExecutor.cmd_from_template(node,
-                                      'lisp/add_lisp_locator.vat',
-                                      lisp_name=locator_name,
-                                      sw_if_index=sw_if_index,
-                                      priority=priority,
-                                      weight=weight)
+        args = dict(
+            is_add=1,
+            locator_set_name=locator_name,
+            sw_if_index=sw_if_index,
+            priority=priority,
+            weight=weight
+        )
+
+        cmd = u"lisp_add_del_locator"
+        err_msg = f"Failed to add locator on host {node[u'host']}"
+
+        with PapiSocketExecutor(node) as papi_exec:
+            papi_exec.add(cmd, **args).get_reply(err_msg)
 
     @staticmethod
     def vpp_del_lisp_locator(node, locator_name, sw_if_index, priority, weight):
@@ -252,21 +479,23 @@ class LispLocator(object):
         :type priority: int
         :type weight: int
         """
+        args = dict(
+            is_add=0,
+            locator_set_name=locator_name,
+            sw_if_index=sw_if_index,
+            priority=priority,
+            weight=weight
+        )
 
-        VatExecutor.cmd_from_template(node,
-                                      'lisp/del_lisp_locator.vat',
-                                      lisp_name=locator_name,
-                                      sw_if_index=sw_if_index,
-                                      priority=priority,
-                                      weight=weight)
+        cmd = u"lisp_add_del_locator"
+        err_msg = f"Failed to delete locator on host {node[u'host']}"
 
+        with PapiSocketExecutor(node) as papi_exec:
+            papi_exec.add(cmd, **args).get_reply(err_msg)
 
-class LispLocatorSet(object):
+class LispLocatorSet:
     """Class for Lisp Locator Set API."""
 
-    def __init__(self):
-        pass
-
     @staticmethod
     def vpp_add_lisp_locator_set(node, name):
         """Add lisp locator_set on VPP.
@@ -276,10 +505,18 @@ class LispLocatorSet(object):
         :type node: dict
         :type name: str
         """
+        args = dict(
+            is_add=1,
+            locator_set_name=name,
+            locator_num=0,
+            locators=[]
+        )
 
-        VatExecutor.cmd_from_template(node,
-                                      'lisp/add_lisp_locator_set.vat',
-                                      lisp_name=name)
+        cmd = u"lisp_add_del_locator_set"
+        err_msg = f"Failed to add locator set on host {node[u'host']}"
+
+        with PapiSocketExecutor(node) as papi_exec:
+            papi_exec.add(cmd, **args).get_reply(err_msg)
 
     @staticmethod
     def vpp_del_lisp_locator_set(node, name):
@@ -290,112 +527,74 @@ class LispLocatorSet(object):
         :type node: dict
         :type name: str
         """
+        args = dict(
+            is_add=0,
+            locator_set_name=name,
+            locator_num=0,
+            locators=[]
+        )
 
-        VatExecutor.cmd_from_template(node,
-                                      'lisp/del_lisp_locator_set.vat',
-                                      lisp_name=name)
+        cmd = u"lisp_add_del_locator_set"
+        err_msg = f"Failed to delete locator set on host {node[u'host']}"
 
+        with PapiSocketExecutor(node) as papi_exec:
+            papi_exec.add(cmd, **args).get_reply(err_msg)
 
-class LispSetup(object):
+class LispSetup:
     """Lisp setup in topology."""
 
-    def __init__(self):
-        pass
-
     @staticmethod
-    def vpp_set_lisp_locator_set(node, locator_sets):
+    def vpp_set_lisp_locator_set(node, locator_set_list):
         """Set lisp locator_sets on VPP node in topology.
 
-        There are two ways how set lisp locator_set.
-        One locator_set can contain multiple locators.
-        Add new locator_set with same name as it already save in vpp
-        will reset locator_set and his locator.
-        To not reset locator_set, use "normal" type of generate data,
-        where the locator_set is set just once.
-        To test reset locator_set use "reset" type of generate data,
-        where the locator_set will be set multiple times.
-
         :param node: VPP node.
-        :param locator_sets: Dictionary containing information of locator_set.
+        :param locator_set_list: List of locator_set.
         :type node: dict
-        :type locator_sets: dict
+        :type locator_set_list: list
         """
 
-        if node['type'] != NodeType.DUT:
-            raise ValueError('Lisp locator set, node is not DUT')
+        if node[u"type"] != NodeType.DUT:
+            raise ValueError(u"Node is not DUT")
 
-        lisp_locator_set = LispLocatorSet()
         lisp_locator = LispLocator()
-        for locator_set_type, item in locator_sets.iteritems():
-            if locator_set_type == 'normal':
-                lsm_set = 1
-            elif locator_set_type == 'reset':
-                lsm_set = 0
-            else:
-                raise ValueError('Unknown locator_set_type value: '
-                                 '{}'.format(locator_set_type))
-
-            locator_set_list = []
-            for locator_set in item:
-                locator_name = locator_set.get('locator-set')
-                sw_if_index = locator_set.get('locator')
-                priority = locator_set.get('priority')
-                weight = locator_set.get('weight')
-                if lsm_set == 1:
-                    if locator_name not in locator_set_list:
-                        locator_set_list.append(locator_name)
-                        lisp_locator_set.vpp_add_lisp_locator_set(node,
-                                                                  locator_name)
-                else:
-                    lisp_locator_set.vpp_add_lisp_locator_set(node,
-                                                              locator_name)
-                lisp_locator.vpp_add_lisp_locator(node,
-                                                  locator_name,
-                                                  sw_if_index,
-                                                  priority,
-                                                  weight)
+        lisp_locator_set = LispLocatorSet()
+        for locator_set in locator_set_list:
+            locator_set_name = locator_set.get(u"locator-set")
+            locator_list = locator_set.get(u"locator")
+            lisp_locator_set.vpp_add_lisp_locator_set(node, locator_set_name)
+            for locator in locator_list:
+                sw_if_index = locator.get(u"locator-index")
+                priority = locator.get(u"priority")
+                weight = locator.get(u"weight")
+                lisp_locator.vpp_add_lisp_locator(
+                    node, locator_set_name, sw_if_index, priority, weight
+                )
 
     @staticmethod
-    def vpp_unset_lisp_locator_set(node, locator_sets):
+    def vpp_unset_lisp_locator_set(node, locator_set_list):
         """Unset lisp locator_sets on VPP node in topology.
 
         :param node: VPP node.
-        :param locator_sets: Dictionary containing information of locator_set.
+        :param locator_set_list: List of locator_set.
         :type node: dict
-        :type locator_sets: dict
+        :type locator_set_list: list
         """
-
-        if node['type'] != NodeType.DUT:
-            raise ValueError('Lisp locator set, node is not DUT')
+        if node[u"type"] != NodeType.DUT:
+            raise ValueError(u"Lisp locator set, node is not DUT")
 
         lisp_locator = LispLocator()
         lisp_locator_set = LispLocatorSet()
-        for locator_set_type, item in locator_sets.iteritems():
-            if locator_set_type == 'normal':
-                lsm_set = 1
-            elif locator_set_type == 'reset':
-                lsm_set = 0
-            else:
-                raise ValueError('Unknown locator_set_type value: '
-                                 '{}'.format(locator_set_type))
-
-            locator_set_list = []
-            for locator_set in item:
-                locator_set_name = locator_set.get('locator-set')
-                sw_if_index = locator_set.get('locator')
-                priority = locator_set.get('priority')
-                weight = locator_set.get('weight')
-                if lsm_set == 1:
-                    if locator_set_name not in locator_set_list:
-                        locator_set_list.append(locator_set_name)
-                else:
-                    lisp_locator.vpp_del_lisp_locator(node,
-                                                      locator_set_name,
-                                                      sw_if_index,
-                                                      priority,
-                                                      weight)
+        for locator_set in locator_set_list:
+            locator_set_name = locator_set.get(u"locator-set")
+            locator_list = locator_set.get(u"locator")
+            for locator in locator_list:
+                sw_if_index = locator.get(u"locator-index")
+                priority = locator.get(u"priority")
+                weight = locator.get(u"weight")
+                lisp_locator.vpp_del_lisp_locator(
+                    node, locator_set_name, sw_if_index, priority, weight
+                )
 
-        for locator_set_name in locator_set_list:
             lisp_locator_set.vpp_del_lisp_locator_set(node, locator_set_name)
 
     @staticmethod
@@ -407,21 +606,20 @@ class LispSetup(object):
         :type node: dict
         :type eid_table: dict
         """
-
-        if node['type'] != NodeType.DUT:
-            raise ValueError('Lisp locator set, node is not DUT')
+        if node[u"type"] != NodeType.DUT:
+            raise ValueError(u"Node is not DUT")
 
         lisp_locator_set = LispLocatorSet()
         lisp_eid = LispLocalEid()
         for eid in eid_table:
-            eid_address = eid.get('eid address')
-            eid_prefix_len = eid.get('eid prefix len')
-            locator_set_name = eid.get('locator-set')
+            vni = eid.get(u"vni")
+            eid_address = eid.get(u"eid")
+            eid_prefix_len = eid.get(u"eid-prefix-len")
+            locator_set_name = eid.get(u"locator-set")
             lisp_locator_set.vpp_add_lisp_locator_set(node, locator_set_name)
-            lisp_eid.vpp_add_lisp_local_eid(node,
-                                            locator_set_name,
-                                            eid_address,
-                                            eid_prefix_len)
+            lisp_eid.vpp_add_lisp_local_eid(
+                node, locator_set_name, vni, eid_address, eid_prefix_len
+            )
 
     @staticmethod
     def vpp_unset_lisp_eid_table(node, eid_table):
@@ -432,24 +630,23 @@ class LispSetup(object):
         :type node: dict
         :type eid_table: dict
         """
-
-        if node['type'] != NodeType.DUT:
-            raise ValueError('Lisp locator set, node is not DUT')
+        if node[u"type"] != NodeType.DUT:
+            raise ValueError(u"Node is not DUT")
 
         locator_set_list = []
         lisp_locator_set = LispLocatorSet()
         lisp_eid = LispLocalEid()
         for eid in eid_table:
-            eid_address = eid.get('eid address')
-            eid_prefix_len = eid.get('eid prefix len')
-            locator_set_name = eid.get('locator-set')
+            vni = eid.get(u"vni")
+            eid_address = eid.get(u"eid")
+            eid_prefix_len = eid.get(u"eid-prefix-len")
+            locator_set_name = eid.get(u"locator-set")
             if locator_set_name not in locator_set_list:
                 locator_set_list.append(locator_set_name)
 
-            lisp_eid.vpp_del_lisp_local_eid(node,
-                                            locator_set_name,
-                                            eid_address,
-                                            eid_prefix_len)
+            lisp_eid.vpp_del_lisp_local_eid(
+                node, locator_set_name, vni, eid_address, eid_prefix_len
+            )
 
         for locator_set_name in locator_set_list:
             lisp_locator_set.vpp_del_lisp_locator_set(node, locator_set_name)
@@ -463,10 +660,9 @@ class LispSetup(object):
         :type node: dict
         :type map_resolver: dict
         """
-
         lisp_map_res = LispMapResolver()
         for map_ip in map_resolver:
-            lisp_map_res.vpp_add_map_resolver(node, map_ip.get('map resolver'))
+            lisp_map_res.vpp_add_map_resolver(node, map_ip.get(u"map resolver"))
 
     @staticmethod
     def vpp_unset_lisp_map_resolver(node, map_resolver):
@@ -477,20 +673,52 @@ class LispSetup(object):
         :type node: dict
         :type map_resolver: dict
         """
-
         lisp_map_res = LispMapResolver()
         for map_ip in map_resolver:
-            lisp_map_res.vpp_del_map_resolver(node, map_ip.get('map resolver'))
+            lisp_map_res.vpp_del_map_resolver(node, map_ip.get(u"map resolver"))
+
+class LispEidTableMap:
+    """
+    Class for EID table map.
+    """
 
     @staticmethod
-    def vpp_lisp_gpe_interface_status(node, state):
-        """Set lisp gpe interface status on VPP node in topology.
+    def vpp_lisp_eid_table_mapping(node, vni, bd_id=None, vrf=None):
+        """
+        Map LISP VNI to either bridge domain ID, or VRF ID.
 
         :param node: VPP node.
-        :param state: State of the gpe iface, up or down
+        :param vni: Lisp VNI.
+        :param bd_id: Bridge domain ID.
+        :param vrf: VRF id.
         :type node: dict
-        :type state: str
+        :type vni: int
+        :type bd_id: int
+        :type vrf: int
         """
-
-        lgi = LispGpeIface()
-        lgi.vpp_lisp_gpe_iface(node, state)
+        # adding default mapping vni=0, vrf=0 needs to be skipped
+        skip = False
+
+        if bd_id:
+            is_l2 = 1
+            dp_table = bd_id
+        else:
+            is_l2 = 0
+            dp_table = vrf
+            # skip adding default mapping
+            if (int(vrf) == 0) and (int(vni) == 0):
+                skip = True
+
+        args = dict(
+            is_add=1,
+            vni=int(vni),
+            dp_table=int(dp_table),
+            is_l2=is_l2
+        )
+
+        cmd = u"lisp_eid_table_add_del_map"
+        err_msg = f"Failed to add eid table map on host {node[u'host']}"
+
+        if not skip:
+            with PapiSocketExecutor(node) as papi_exec:
+                papi_exec.add(cmd, **args).get_reply(err_msg)