X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FLispUtil.py;h=c50e626b80f6e90c32e41244b1f105473a131a33;hp=17a46cd49cf61f693c970ca09d5b4bcd7e648e0b;hb=c3bf9f6ad20223998c1103ba3061a5e338979e2b;hpb=7df894ce5707c06367128ae299e9e905b7106c4b diff --git a/resources/libraries/python/LispUtil.py b/resources/libraries/python/LispUtil.py index 17a46cd49c..c50e626b80 100644 --- a/resources/libraries/python/LispUtil.py +++ b/resources/libraries/python/LispUtil.py @@ -15,7 +15,7 @@ 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): @@ -25,22 +25,44 @@ class LispUtil(object): pass @staticmethod - def vpp_show_lisp_locator_set(node): - """Get lisp locator_set from VPP node. + def vpp_show_lisp_state(node): + """Get lisp state from VPP node. :param node: VPP node. :type node: dict - :return: Lisp locator_set data as python list. + :return: Lisp gpe state. :rtype: list """ vat = VatExecutor() - vat.execute_script_json_out('lisp/show_lisp_locator_set.vat', node) + vat.execute_script_json_out('lisp/show_lisp_status.vat', + node) return JsonParser().parse_data(vat.get_script_stdout()) @staticmethod - def vpp_show_lisp_local_eid_table(node): - """Get lisp local eid table from VPP 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 + :type items_filter: str + :return: Lisp locator_set data as python list. + :rtype: list + """ + + 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_eid_table(node): + """Get lisp eid table from VPP node. :param node: VPP node. :type node: dict @@ -49,7 +71,7 @@ class LispUtil(object): """ 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 @@ -86,7 +108,7 @@ class LispUtil(object): for tmp in lisp_val1: if tmp not in lisp_val2: - raise RuntimeError('Value {} is not find in vpp:\n' + raise RuntimeError('Value {} not found in vpp:\n' '{}'.format(tmp, lisp_val2)) def lisp_locator_s_should_be_equal(self, locator_set1, locator_set2): @@ -94,39 +116,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() @@ -134,6 +157,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 @@ -143,38 +167,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) - loc_type = {'normal': locator_set_list} - return loc_type + l_name = 'ls{0}'.format(num) + locator_set = {'locator-set': l_name, + 'locator': locator_list} + locator_set_list.append(locator_set) + + 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 @@ -182,70 +207,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 - - @staticmethod - def generate_lisp_local_eid_data(ipv4_num, ipv6_num): - """Generate a list of lisp local eid we want set to VPP and - then check if is set correct. - - :param ipv4_num: Generate n ipv4 eid address. - :param ipv6_num: Generate n ipv6 eid address. - :type ipv4_num: str - :type ipv6_num: str - :return: list of lisp local eid. - :rtype: list - """ - - eid_table = [] - for num in range(0, int(ipv4_num)): - addrr = '192.168.{}.1'.format(num) - eid = {'eid address': addrr, - 'eid prefix len': 24, - 'locator-set': 'ls1'} - eid_table.append(eid) - - for num in range(0, int(ipv6_num)): - addrr = '10:{}::1'.format(num + 1) - eid = {'eid address': addrr, - 'eid prefix len': 32, - 'locator-set': 'ls1'} - eid_table.append(eid) - - return eid_table - - @staticmethod - def generate_lisp_map_resolver_data(ipv4_num, ipv6_num): - """Generate a list of lisp map resolvers we want set to VPP and - then check if is set correct. - - :param ipv4_num: Generate n ipv4 map resolver address. - :param ipv6_num: Generate n ipv6 map resolver address. - :type ipv4_num: str - :type ipv6_num: str - :return: list of lisp map resolver. - :rtype: list - """ - - map_resolver = [] - for i in range(0, int(ipv4_num)): - addr = '192.169.{}.1'.format(i) - resolver = {'map resolver': addr} - map_resolver.append(resolver) - - for i in range(0, int(ipv6_num)): - addr = '12:{}::1'.format(i + 1) - resolver = {'map resolver': addr} - map_resolver.append(resolver) - - return map_resolver + return locator_set_list def lisp_is_empty(self, lisp_params): """Check if the input param are empty.