-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2018 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:
from resources.libraries.python.parsers.JsonParser import JsonParser
from resources.libraries.python.topology import Topology
-from resources.libraries.python.VatExecutor import VatExecutor
+from resources.libraries.python.VatExecutor import VatExecutor, VatTerminal
class LispUtil(object):
:param node: VPP node.
:type node: dict
- :return: Lisp gpe state.
+ :returns: Lisp gpe state.
:rtype: list
"""
return JsonParser().parse_data(vat.get_script_stdout())
@staticmethod
- def vpp_show_lisp_locator_set(node):
+ def vpp_show_lisp_locator_set(node, items_filter):
"""Get lisp locator_set from VPP node.
:param node: VPP node.
+ :param items_filter: Filter which specifies which items should be
+ retrieved - local, remote, empty string = both.
:type node: dict
- :return: Lisp locator_set data as python list.
+ :type items_filter: str
+ :returns: Lisp locator_set data as python list.
:rtype: list
"""
- vat = VatExecutor()
- vat.execute_script_json_out('lisp/show_lisp_locator_set.vat', node)
- return JsonParser().parse_data(vat.get_script_stdout())
+ try:
+ with VatTerminal(node) as vat:
+ response = vat.vat_terminal_exec_cmd_from_template(
+ 'lisp/show_lisp_locator_set.vat', filter=items_filter)
+ return response[0]
+ except ValueError:
+ return []
@staticmethod
- def vpp_show_lisp_local_eid_table(node):
- """Get lisp local eid table from VPP node.
+ def vpp_show_lisp_eid_table(node):
+ """Get lisp eid table from VPP node.
:param node: VPP node.
:type node: dict
- :return: Lisp eid table as python list.
+ :returns: Lisp eid table as python list.
:rtype: list
"""
vat = VatExecutor()
- vat.execute_script_json_out('lisp/show_lisp_local_eid_table.vat', node)
+ vat.execute_script_json_out('lisp/show_lisp_eid_table.vat', node)
return JsonParser().parse_data(vat.get_script_stdout())
@staticmethod
:param node: VPP node.
:type node: dict
- :return: Lisp map resolver as python list.
+ :returns: Lisp map resolver as python list.
:rtype: list
"""
vat.execute_script_json_out('lisp/show_lisp_map_resolver.vat', node)
return JsonParser().parse_data(vat.get_script_stdout())
+ @staticmethod
+ def vpp_show_lisp_map_register(node):
+ """Get LISP Map Register from VPP node.
+
+ :param node: VPP node.
+ :type node: dict
+ :returns: LISP Map Register as python list.
+ :rtype: list
+ """
+
+ vat = VatExecutor()
+ vat.execute_script_json_out('lisp/show_lisp_map_register.vat', node)
+ return JsonParser().parse_data(vat.get_script_stdout())
+
+ @staticmethod
+ def vpp_show_lisp_map_request_mode(node):
+ """Get LISP Map Request mode from VPP node.
+
+ :param node: VPP node.
+ :type node: dict
+ :returns: LISP Map Request mode as python list.
+ :rtype: list
+ """
+
+ vat = VatExecutor()
+ vat.execute_script_json_out('lisp/show_lisp_map_request_mode.vat', node)
+ return JsonParser().parse_data(vat.get_script_stdout())
+
+ @staticmethod
+ def vpp_show_lisp_map_server(node):
+ """Get LISP Map Server from VPP node.
+
+ :param node: VPP node.
+ :type node: dict
+ :returns: LISP Map Server as python list.
+ :rtype: list
+ """
+
+ vat = VatExecutor()
+ vat.execute_script_json_out('lisp/show_lisp_map_server.vat', node)
+ return JsonParser().parse_data(vat.get_script_stdout())
+
+ @staticmethod
+ def vpp_show_lisp_petr_config(node):
+ """Get LISP PETR configuration from VPP node.
+
+ :param node: VPP node.
+ :type node: dict
+ :returns: LISP PETR configuration as python list.
+ :rtype: list
+ """
+
+ vat = VatExecutor()
+ vat.execute_script_json_out('lisp/show_lisp_petr_config.vat', node)
+ return JsonParser().parse_data(vat.get_script_stdout())
+
+ @staticmethod
+ def vpp_show_lisp_rloc_config(node):
+ """Get LISP RLOC configuration from VPP node.
+
+ :param node: VPP node.
+ :type node: dict
+ :returns: LISP RLOC configuration as python list.
+ :rtype: list
+ """
+
+ vat = VatExecutor()
+ vat.execute_script_json_out('lisp/show_lisp_rloc_config.vat', node)
+ return JsonParser().parse_data(vat.get_script_stdout())
+
+ @staticmethod
+ def vpp_show_lisp_pitr(node):
+ """Get Lisp PITR feature config from VPP node.
+
+ :param node: VPP node.
+ :type node: dict
+ :returns: Lisp PITR config data.
+ :rtype: dict
+ """
+
+ vat = VatExecutor()
+ vat.execute_script_json_out('lisp/show_lisp_pitr.vat', node)
+ return JsonParser().parse_data(vat.get_script_stdout())
+
@staticmethod
def lisp_should_be_equal(lisp_val1, lisp_val2):
"""Fail if the lisp values are not equal.
:type locator_set2: list
"""
- # Remove duplicate value which is not set in vpp node.
locator_set_list = []
- 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']
-
+ for item in locator_set1:
+ if item not in locator_set_list:
+ locator_set_list.append(item)
self.lisp_should_be_equal(locator_set_list, locator_set2)
@staticmethod
:param locator_set_number: Generate n locator_set.
:type node: dict
:type locator_set_number: str
- :return: list of lisp locator_set.
- :rtype: list
+ :returns: list of lisp locator_set, list of lisp locator_set expected
+ from VAT.
+ :rtype: tuple
"""
topo = Topology()
locator_set_list = []
+ locator_set_list_vat = []
i = 0
for num in range(0, int(locator_set_number)):
locator_list = []
'locator': locator_list}
locator_set_list.append(locator_set)
- return locator_set_list
+ locator_set_vat = {"ls_name": l_name,
+ "ls_index": num}
+ locator_set_list_vat.append(locator_set_vat)
+
+ return locator_set_list, locator_set_list_vat
@staticmethod
def generate_duplicate_lisp_locator_set_data(node, locator_set_number):
:param locator_set_number: Generate n locator_set.
:type node: dict
:type locator_set_number: str
- :return: list of lisp locator_set.
- :rtype: list
+ :returns: list of lisp locator_set, list of lisp locator_set expected
+ from VAT.
+ :rtype: tuple
"""
topo = Topology()
locator_set_list = []
+ locator_set_list_vat = []
i = 0
for num in range(0, int(locator_set_number)):
locator_list = []
'locator': locator_list}
locator_set_list.append(locator_set)
- return locator_set_list
+ locator_set_vat = {"ls_name": l_name,
+ "ls_index": num}
+ locator_set_list_vat.append(locator_set_vat)
+
+ return locator_set_list, locator_set_list_vat
def lisp_is_empty(self, lisp_params):
"""Check if the input param are empty.
Code Review / csit.git / blobdiff