aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries
diff options
context:
space:
mode:
Diffstat (limited to 'resources/libraries')
-rw-r--r--resources/libraries/python/LispSetup.py175
-rw-r--r--resources/libraries/python/LispUtil.py90
-rw-r--r--resources/libraries/robot/lisp/lisp_api.robot27
-rw-r--r--resources/libraries/robot/lisp/lisp_static_mapping.robot6
4 files changed, 136 insertions, 162 deletions
diff --git a/resources/libraries/python/LispSetup.py b/resources/libraries/python/LispSetup.py
index 14f99293df..82e1a9787a 100644
--- a/resources/libraries/python/LispSetup.py
+++ b/resources/libraries/python/LispSetup.py
@@ -168,44 +168,66 @@ class LispLocalEid(object):
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):
@@ -303,66 +325,43 @@ class LispSetup(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:
@@ -370,33 +369,21 @@ class LispSetup(object):
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):
@@ -409,17 +396,19 @@ class LispSetup(object):
"""
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)
@@ -434,20 +423,22 @@ class LispSetup(object):
"""
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)
diff --git a/resources/libraries/python/LispUtil.py b/resources/libraries/python/LispUtil.py
index 219d2c7680..b21e1ae511 100644
--- a/resources/libraries/python/LispUtil.py
+++ b/resources/libraries/python/LispUtil.py
@@ -35,7 +35,7 @@ class LispUtil(object):
"""
vat = VatExecutor()
- vat.execute_script_json_out('lisp/show_lisp_enable_disable.vat',
+ vat.execute_script_json_out('lisp/show_lisp_status.vat',
node)
return JsonParser().parse_data(vat.get_script_stdout())
@@ -109,39 +109,40 @@ class LispUtil(object):
:param locator_set1: Generate lisp value.
:param locator_set2: Lisp value from VPP.
- :type locator_set1: dict
+ :type locator_set1: list
:type locator_set2: list
"""
- reset_list = []
+ # Remove duplicate value which is not set in vpp node.
locator_set_list = []
- for locator_set_type, item in locator_set1.iteritems():
- if locator_set_type == 'normal':
- self.lisp_should_be_equal(item, locator_set2)
- elif locator_set_type == 'reset':
- for locator_list in reversed(item):
- name = locator_list.get('locator-set')
- if name not in locator_set_list:
- reset_list.insert(0, locator_list)
- locator_set_list.append(name)
- self.lisp_should_be_equal(reset_list, locator_set2)
- else:
- raise ValueError('Unknown locator_set_type value: '
- '{}'.format(locator_set_type))
+ tmp_list = list(locator_set1)
+ while len(tmp_list):
+ locator_set = tmp_list.pop(0)
+ locator_set_name = locator_set.get('locator-set')
+ for tmp_loc_set in tmp_list:
+ tmp_loc_set_name = tmp_loc_set.get('locator-set')
+ if locator_set_name == tmp_loc_set_name:
+ locator_set = tmp_loc_set
+ tmp_list.remove(tmp_loc_set)
+ locator_set_list.append(locator_set)
+
+ for locator_set in locator_set2:
+ if 'locator-set-index' in locator_set:
+ del locator_set['locator-set-index']
+
+ self.lisp_should_be_equal(locator_set_list, locator_set2)
@staticmethod
- def generate_lisp_locator_set_data(node, locator_set_number):
+ def generate_unique_lisp_locator_set_data(node, locator_set_number):
"""Generate a list of lisp locator_set we want set to VPP and
- then check if is set correct.
-
- "normal" type of data set locator_set just once.
+ then check if it is set correctly. All locator_sets are unique.
:param node: VPP node.
:param locator_set_number: Generate n locator_set.
:type node: dict
:type locator_set_number: str
- :return: dict of lisp locator_set.
- :rtype: dict
+ :return: list of lisp locator_set.
+ :rtype: list
"""
topo = Topology()
@@ -149,6 +150,7 @@ class LispUtil(object):
locator_set_list = []
i = 0
for num in range(0, int(locator_set_number)):
+ locator_list = []
for interface in node['interfaces'].values():
link = interface.get('link')
i += 1
@@ -158,38 +160,39 @@ class LispUtil(object):
if_name = topo.get_interface_by_link_name(node, link)
sw_if_index = topo.get_interface_sw_index(node, if_name)
if if_name is not None:
- l_name = 'ls{0}'.format(num)
- locator_set = {'locator-set': l_name,
- 'locator': sw_if_index,
- 'priority': i,
- 'weight': i}
- locator_set_list.append(locator_set)
+ locator = {'locator-index': sw_if_index,
+ 'priority': i,
+ 'weight': i}
+ locator_list.append(locator)
+
+ l_name = 'ls{0}'.format(num)
+ locator_set = {'locator-set': l_name,
+ 'locator': locator_list}
+ locator_set_list.append(locator_set)
- loc_type = {'normal': locator_set_list}
- return loc_type
+ return locator_set_list
@staticmethod
- def generate_lisp_locator_set_reset_data(node, locator_set_number):
+ def generate_duplicate_lisp_locator_set_data(node, locator_set_number):
"""Generate a list of lisp locator_set we want set to VPP and
- then check if is set correct.
-
- "reset" type of data set locator_set multiple times,
- use to test reset locator_set in vpp.
+ then check if it is set correctly. Some locator_sets are duplicated.
:param node: VPP node.
:param locator_set_number: Generate n locator_set.
:type node: dict
:type locator_set_number: str
- :return: dict of lisp locator_set.
- :rtype: dict
+ :return: list of lisp locator_set.
+ :rtype: list
"""
topo = Topology()
-
locator_set_list = []
+ i = 0
for num in range(0, int(locator_set_number)):
+ locator_list = []
for interface in node['interfaces'].values():
link = interface.get('link')
+ i += 1
if link is None:
continue
@@ -197,14 +200,15 @@ class LispUtil(object):
sw_if_index = topo.get_interface_sw_index(node, if_name)
if if_name is not None:
l_name = 'ls{0}'.format(num)
+ locator = {'locator-index': sw_if_index,
+ 'priority': i,
+ 'weight': i}
+ locator_list.append(locator)
locator_set = {'locator-set': l_name,
- 'locator': sw_if_index,
- 'priority': 1,
- 'weight': 1}
+ 'locator': locator_list}
locator_set_list.append(locator_set)
- loc_type = {'reset': locator_set_list}
- return loc_type
+ return locator_set_list
def lisp_is_empty(self, lisp_params):
"""Check if the input param are empty.
diff --git a/resources/libraries/robot/lisp/lisp_api.robot b/resources/libraries/robot/lisp/lisp_api.robot
index 54ba6b7703..8d0a98c630 100644
--- a/resources/libraries/robot/lisp/lisp_api.robot
+++ b/resources/libraries/robot/lisp/lisp_api.robot
@@ -40,7 +40,7 @@
| | ... | \| ${locator_set_number} \|
| | ...
| | [Arguments] | ${dut_node} | ${locator_set_number}
-| | ${locator_set_values}= | Generate Lisp Locator Set Data |
+| | ${locator_set_values}= | Generate Unique Lisp Locator Set Data |
| | ... | ${dut_node} | ${locator_set_number}
| | Set Test Variable | ${locator_set_values}
@@ -143,33 +143,10 @@
| | ... | are prepared \| ${nodes['DUT1']} \| ${locator_set_number} \|
| | ...
| | [Arguments] | ${dut_node} | ${locator_set_number}
-| | ${locator_set_values}= | Generate Lisp Locator Set Reset Data |
+| | ${locator_set_values}= | Generate Duplicate Lisp Locator Set Data |
| | ... | ${dut_node} | ${locator_set_number}
| | Set Test Variable | ${locator_set_values}
-| Lisp eid address is prepared
-| | [Documentation] | Generate lisp eid address for testing lisp eid API.
-| | ...
-| | ... | *Arguments:*
-| | ... | - dut_node - DUT node. Type: dictionary
-| | ... | - eid_ipv4_num - Number of generate ipv4 address. Type: int
-| | ... | - eid_ipv6_num - Number of generate ipv6 address. Type: int
-| | ...
-| | ... | *Return:*
-| | ... | - No value returned
-| | ...
-| | ... | _NOTE:_ This KW sets following test case variables:
-| | ... | - set_eid - New generate eid data.
-| | ...
-| | ... | *Example:*
-| | ... | \| Given Lisp eid address is prepared \| ${nodes['DUT1']} \
-| | ... | \| ${eid_ipv4_num} \| ${eid_ipv6_num} \|
-| | ...
-| | [Arguments] | ${dut_node} | ${eid_ipv4_num} | ${eid_ipv6_num}
-| | ${set_eid} = | Generate Lisp Local Eid Data
-| | ... | ${eid_ipv4_num} | ${eid_ipv6_num}
-| | Set Test Variable | ${set_eid}
-
| Lisp eid address is set
| | [Documentation] | Set the lisp eid address on the VPP node.
| | ...
diff --git a/resources/libraries/robot/lisp/lisp_static_mapping.robot b/resources/libraries/robot/lisp/lisp_static_mapping.robot
index b6c0e791b4..3c0668831d 100644
--- a/resources/libraries/robot/lisp/lisp_static_mapping.robot
+++ b/resources/libraries/robot/lisp/lisp_static_mapping.robot
@@ -62,7 +62,8 @@
| | Vpp Add Lisp Locator | ${dut1_node} | ${locator_set['locator_name']}
| | ... | ${dut1_int_index} | ${locator_set['priority']}
| | ... | ${locator_set['weight']}
-| | Vpp Add Lisp Local Eid | ${dut1_node} | ${dut1_eid['locator_name']} | ${dut1_eid['eid']}
+| | Vpp Add Lisp Local Eid | ${dut1_node} | ${dut1_eid['locator_name']}
+| | ... | ${dut1_eid['vni']} | ${dut1_eid['eid']}
| | ... | ${dut1_eid['prefix']}
| | Vpp Add Lisp Remote Mapping | ${dut1_node} | ${dut1_static_mapping['vni']}
| | ... | ${dut1_static_mapping['deid']}
@@ -75,7 +76,8 @@
| | Vpp Add Lisp Locator | ${dut2_node} | ${locator_set['locator_name']}
| | ... | ${dut2_int_index} | ${locator_set['priority']}
| | ... | ${locator_set['weight']}
-| | Vpp Add Lisp Local Eid | ${dut2_node} | ${dut2_eid['locator_name']} | ${dut2_eid['eid']}
+| | Vpp Add Lisp Local Eid | ${dut2_node} | ${dut2_eid['locator_name']}
+| | ... | ${dut2_eid['vni']} | ${dut2_eid['eid']}
| | ... | ${dut2_eid['prefix']}
| | Vpp Add Lisp Remote Mapping | ${dut2_node} | ${dut2_static_mapping['vni']}
| | ... | ${dut2_static_mapping['deid']}