diff options
-rw-r--r-- | resources/libraries/python/VatJsonUtil.py | 54 | ||||
-rw-r--r-- | resources/libraries/robot/ipv4.robot | 22 |
2 files changed, 76 insertions, 0 deletions
diff --git a/resources/libraries/python/VatJsonUtil.py b/resources/libraries/python/VatJsonUtil.py index 05c93a1d06..e17375ab56 100644 --- a/resources/libraries/python/VatJsonUtil.py +++ b/resources/libraries/python/VatJsonUtil.py @@ -102,6 +102,60 @@ class VatJsonUtil(object): ifc['mtu'] = interface_dict["mtu"] @staticmethod + def get_interface_sw_index_from_json(interface_dump_json, interface_name): + """Get sw_if_index from given JSON output by interface name. + + :param interface_dump_json: JSON output from dump_interface_list VAT + command. + :param interface_name: Interface name. + :type interface_dump_json: str + :type interface_name: str + :return: SW interface index. + :rtype: int + :raises ValueError: If interface not found in interface_dump_json. + """ + logger.trace(interface_dump_json) + interface_list = JsonParser().parse_data(interface_dump_json) + for interface in interface_list: + try: + if interface['interface_name'] == interface_name: + index = interface['sw_if_index'] + logger.debug('Interface with name {} has sw_if_index {}.' + .format(interface_name, index)) + return index + except KeyError: + pass + raise ValueError('Interface with name {} not found.' + .format(interface_name)) + + @staticmethod + def get_interface_name_from_json(interface_dump_json, sw_if_index): + """Get interface name from given JSON output by sw_if_index. + + :param interface_dump_json: JSON output from dump_interface_list VAT + command. + :param sw_if_index: SW interface index. + :type interface_dump_json: str + :type sw_if_index: int + :return: Interface name. + :rtype: str + :raises ValueError: If interface not found in interface_dump_json. + """ + logger.trace(interface_dump_json) + interface_list = JsonParser().parse_data(interface_dump_json) + for interface in interface_list: + try: + if interface['sw_if_index'] == sw_if_index: + interface_name = interface['interface_name'] + logger.debug('Interface with name {} has sw_if_index {}.' + .format(interface_name, sw_if_index)) + return interface_name + except KeyError: + pass + raise ValueError('Interface with sw_if_index {} not found.' + .format(sw_if_index)) + + @staticmethod def verify_vat_retval(vat_out, exp_retval=0, err_msg='VAT cmd failed'): """Verify return value of VAT command. diff --git a/resources/libraries/robot/ipv4.robot b/resources/libraries/robot/ipv4.robot index 63a1188332..9e31076772 100644 --- a/resources/libraries/robot/ipv4.robot +++ b/resources/libraries/robot/ipv4.robot @@ -103,3 +103,25 @@ | | | ... | ${dst_mac} | ${src_ip} | ${dst_ip} | | Run Traffic Script On Node | arp_request.py | ${tg_node} | ${args} +| IP addresses are set on interfaces +| | [Documentation] | Iterates through @{args} list and Set Interface Address +| | ... | for every (${dut_node}, ${interface}, ${address}, +| | ... | ${prefix}) tuple. +| | ... +| | ... | *Arguments:* +| | ... | - ${dut_node} - Node where IP address should be set to. +| | ... | Type: dictionary +| | ... | - ${interface} - Interface name. Type: string +| | ... | - ${address} - IP address. Type: string +| | ... | - ${prefix} - Prefix length. Type: integer +| | ... +| | ... | *Example:* +| | ... +| | ... | \| IP addresses are set on interfaces \ +| | ... | \| ${dut1_node} \| ${dut1_to_dut2} \| 192.168.1.1 \| 24 \| +| | ... | \| ... \| ${dut1_node} \| ${dut1_to_tg} \| 192.168.2.1 \| 24 \| +| | ... +| | [Arguments] | @{args} +| | :FOR | ${dut_node} | ${interface} | ${address} | ${prefix} | IN | @{args} +| | | Set Interface Address | ${dut_node} | ${interface} | ${address} +| | | ... | ${prefix} |