-# 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.
: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, is_mac=False):
+ 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.
:type rloc: str
:type is_mac: bool
"""
- if is_mac:
- deid_prefix = ''
- seid_prefix = ''
+ 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:
- deid_prefix = '/{}'.format(deid_prefix)
- seid_prefix = '/{}'.format(seid_prefix)
- 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)
+ 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.
:type seid_prefix: int
:type rloc: str
"""
-
- VatExecutor.cmd_from_template(node,
- 'lisp/del_lisp_remote_mapping.vat',
- vni=vni,
- deid=deid,
- deid_prefix=deid_prefix,
- seid=seid,
- seid_prefix=seid_prefix,
- rloc=rloc)
-
-
-class LispAdjacency(object):
+ # 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."""
- def __init__(self):
- pass
-
@staticmethod
- def vpp_add_lisp_adjacency(node, vni, deid, deid_prefix, seid,
- seid_prefix, is_mac=False):
+ 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.
:type seid_prefix: int
:type is_mac: bool
"""
- if is_mac:
- deid_prefix = ''
- seid_prefix = ''
+ 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:
- deid_prefix = '/{}'.format(deid_prefix)
- seid_prefix = '/{}'.format(seid_prefix)
- VatExecutor.cmd_from_template(node,
- 'lisp/add_lisp_adjacency.vat',
- vni=vni,
- deid=deid,
- deid_prefix=deid_prefix,
- seid=seid,
- seid_prefix=seid_prefix)
+ 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)
@staticmethod
- def vpp_del_lisp_adjacency(node, vni, deid, deid_prefix, seid,
- seid_prefix):
+ def vpp_del_lisp_adjacency(
+ node, vni, deid, deid_prefix, seid, seid_prefix):
"""Delete lisp adjacency on the VPP node in topology.
:param node: VPP node.
:type seid: str
:type seid_prefix: int
"""
-
- VatExecutor.cmd_from_template(node,
- 'lisp/del_lisp_adjacency.vat',
- vni=vni,
- deid=deid,
- deid_prefix=deid_prefix,
- seid=seid,
- seid_prefix=seid_prefix)
-
-
-class LispGpeStatus(object):
+ # 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."""
- def __init__(self):
- pass
-
@staticmethod
def vpp_lisp_gpe_enable_disable(node, state):
"""Change the state of LISP GPE - 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_status.vat',
- state=state)
-
-
-class LispGpeIface(object):
- """Class for Lisp gpe interface API."""
-
- def __init__(self):
- pass
-
- @staticmethod
- def vpp_lisp_gpe_iface(node, state):
- """Set lisp gpe interface up or down on the VPP node in topology.
-
- :param node: VPP node.
- :param state: State of the gpe iface, up or down.
- :type node: dict
- :type state: str
- """
-
- 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 LispGpeForwardEntry(object):
+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.
"""
- def __init__(self):
- pass
-
@staticmethod
def add_lisp_gpe_forward_entry(node, *args):
"""Not implemented"""
# TODO: Implement when VPP-334 is fixed.
- pass
@staticmethod
def del_lisp_gpe_forward_entry(node, *args):
"""Not implemented"""
# TODO: Implement when VPP-334 is fixed.
- pass
-class LispMapResolver(object):
+class LispMapResolver:
"""Class for Lisp map resolver API."""
- def __init__(self):
- pass
-
@staticmethod
def vpp_add_map_resolver(node, map_resolver_ip):
"""Set lisp map resolver on the VPP node in topology.
: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):
: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, vni, eid,
- prefix_len=None):
+ 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.
:type eid: str
:type prefix_len: int
"""
-
- if prefix_len is not None:
- VatExecutor.cmd_from_template(node,
- 'lisp/add_lisp_local_eid.vat',
- vni=vni,
- eid=eid,
- 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:
- VatExecutor.cmd_from_template(node,
- 'lisp/add_lisp_local_eid_mac.vat',
- vni=vni,
- eid=eid,
- locator_name=locator_set_name)
+ 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, vni, eid,
- prefix_len=None):
+ 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.
:type eid: str
:type prefix_len: int
"""
-
- if prefix_len is not None:
- VatExecutor.cmd_from_template(node,
- 'lisp/del_lisp_local_eid.vat',
- vni=vni,
- eid=eid,
- 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:
- VatExecutor.cmd_from_template(node,
- 'lisp/del_lisp_local_eid_mac.vat',
- vni=vni,
- eid=eid,
- locator_name=locator_set_name)
+ 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)
+ )
-class LispLocator(object):
- """Class for the Lisp Locator API."""
+ cmd = u"lisp_add_del_local_eid"
+ err_msg = f"Failed to delete local eid on host {node[u'host']}"
- def __init__(self):
- pass
+ with PapiSocketExecutor(node) as papi_exec:
+ papi_exec.add(cmd, **args).get_reply(err_msg)
+
+class LispLocator:
+ """Class for the Lisp Locator API."""
@staticmethod
def vpp_add_lisp_locator(node, locator_name, sw_if_index, priority, weight):
: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):
: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.
:type node: dict
:type name: str
"""
+ args = dict(
+ is_add=1,
+ locator_set_name=name,
+ locator_num=0,
+ locators=[]
+ )
+
+ cmd = u"lisp_add_del_locator_set"
+ err_msg = f"Failed to add locator set on host {node[u'host']}"
- VatExecutor.cmd_from_template(node,
- 'lisp/add_lisp_locator_set.vat',
- lisp_name=name)
+ with PapiSocketExecutor(node) as papi_exec:
+ papi_exec.add(cmd, **args).get_reply(err_msg)
@staticmethod
def vpp_del_lisp_locator_set(node, name):
: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_set_list):
"""Set lisp locator_sets on VPP node in topology.
:type locator_set_list: list
"""
- if node['type'] != NodeType.DUT:
- raise ValueError('Node is not DUT')
+ if node[u"type"] != NodeType.DUT:
+ raise ValueError(u"Node is not DUT")
lisp_locator = LispLocator()
lisp_locator_set = LispLocatorSet()
for locator_set in locator_set_list:
- locator_set_name = locator_set.get('locator-set')
- locator_list = locator_set.get('locator')
- lisp_locator_set.vpp_add_lisp_locator_set(node,
- locator_set_name)
+ 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('locator-index')
- priority = locator.get('priority')
- weight = locator.get('weight')
- lisp_locator.vpp_add_lisp_locator(node,
- locator_set_name,
- sw_if_index,
- priority,
- weight)
+ 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_set_list):
:type node: 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 in locator_set_list:
- locator_set_name = locator_set.get('locator-set')
- locator_list = locator_set.get('locator')
+ 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('locator-index')
- priority = locator.get('priority')
- weight = locator.get('weight')
- lisp_locator.vpp_del_lisp_locator(node,
- locator_set_name,
- sw_if_index,
- priority,
- weight)
-
- lisp_locator_set.vpp_del_lisp_locator_set(node,
- locator_set_name)
+ 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
+ )
+
+ lisp_locator_set.vpp_del_lisp_locator_set(node, locator_set_name)
@staticmethod
def vpp_set_lisp_eid_table(node, eid_table):
:type node: dict
:type eid_table: dict
"""
-
- if node['type'] != NodeType.DUT:
- raise ValueError('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:
- vni = eid.get('vni')
- eid_address = eid.get('eid')
- 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,
- vni,
- 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):
:type node: dict
:type eid_table: dict
"""
-
- if node['type'] != NodeType.DUT:
- raise ValueError('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:
- vni = eid.get('vni')
- eid_address = eid.get('eid')
- 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,
- vni,
- 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)
: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):
: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'))
-
- @staticmethod
- def vpp_lisp_gpe_interface_status(node, state):
- """Set lisp gpe interface status on VPP node in topology.
-
- :param node: VPP node.
- :param state: State of the gpe iface, up or down
- :type node: dict
- :type state: str
- """
+ lisp_map_res.vpp_del_map_resolver(node, map_ip.get(u"map resolver"))
- lgi = LispGpeIface()
- lgi.vpp_lisp_gpe_iface(node, state)
-
-
-class LispEidTableMap(object):
+class LispEidTableMap:
"""
Class for EID table map.
"""
@staticmethod
- def vpp_lisp_eid_table_mapping(node, vni, bd=None, vrf=None):
+ 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 vni: Lisp VNI.
- :param bd: Bridge domain ID.
+ :param bd_id: Bridge domain ID.
:param vrf: VRF id.
:type node: dict
:type vni: int
- :type bd: int
+ :type bd_id: int
:type vrf: int
"""
- if bd:
- bd_or_vrf = 'bd_index {}'.format(bd)
+ # adding default mapping vni=0, vrf=0 needs to be skipped
+ skip = False
+
+ if bd_id:
+ is_l2 = 1
+ dp_table = bd_id
else:
- bd_or_vrf = 'vrf {}'.format(vrf)
- VatExecutor.cmd_from_template(node,
- 'lisp/lisp_eid_table_add_del_map.vat',
- vni=vni,
- bd_or_vrf=bd_or_vrf)
+ 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)
Code Review / csit.git / blobdiff