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 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)
+ else:
+ VatExecutor.cmd_from_template(node,
+ 'lisp/add_lisp_local_eid_mac.vat',
+ vni=vni,
+ eid=eid,
+ locator_name=locator_set_name)
@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)
+ 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)
+ else:
+ VatExecutor.cmd_from_template(node,
+ 'lisp/del_lisp_local_eid_mac.vat',
+ vni=vni,
+ eid=eid,
+ locator_name=locator_set_name)
class LispLocator(object):
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')
+ raise ValueError('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_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)
+ 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_name,
+ 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:
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('locator-set')
+ locator_list = locator_set.get('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)
- for locator_set_name in locator_set_list:
- lisp_locator_set.vpp_del_lisp_locator_set(node, locator_set_name)
+ lisp_locator_set.vpp_del_lisp_locator_set(node,
+ locator_set_name)
@staticmethod
def vpp_set_lisp_eid_table(node, eid_table):
"""
if node['type'] != NodeType.DUT:
- raise ValueError('Lisp locator set, node is not DUT')
+ raise ValueError('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')
+ vni = eid.get('vni')
+ eid_address = eid.get('eid')
+ eid_prefix_len = eid.get('eid-prefix-len')
locator_set_name = eid.get('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)
"""
if node['type'] != NodeType.DUT:
- raise ValueError('Lisp locator set, node is not DUT')
+ raise ValueError('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')
+ vni = eid.get('vni')
+ eid_address = eid.get('eid')
+ eid_prefix_len = eid.get('eid-prefix-len')
locator_set_name = eid.get('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)
Code Review / csit.git / blobdiff