diff options
Diffstat (limited to 'resources/libraries')
| -rw-r--r-- | resources/libraries/python/IPUtil.py | 14 | ||||
| -rw-r--r-- | resources/libraries/python/Tap.py | 47 |
2 files changed, 34 insertions, 27 deletions
diff --git a/resources/libraries/python/IPUtil.py b/resources/libraries/python/IPUtil.py index 04961fa45a..c3df1fe376 100644 --- a/resources/libraries/python/IPUtil.py +++ b/resources/libraries/python/IPUtil.py @@ -117,12 +117,10 @@ class IPUtil: if not sw_if_index: return list() - is_ipv6 = 1 if ip_version == u"ipv6" else 0 - cmd = u"ip_address_dump" args = dict( sw_if_index=sw_if_index, - is_ipv6=is_ipv6 + is_ipv6=bool(ip_version == u"ipv6") ) err_msg = f"Failed to get L2FIB dump on host {node[u'host']}" @@ -430,7 +428,7 @@ class IPUtil: ) cmd = u"ip_neighbor_add_del" args = dict( - is_add=1, + is_add=True, neighbor=neighbor ) err_msg = f"Failed to add IP neighbor on interface {iface_key}" @@ -607,8 +605,8 @@ class IPUtil: net_addr = ip_address(network) cmd = u"ip_route_add_del" args = dict( - is_add=1, - is_multipath=int(kwargs.get(u"multipath", False)), + is_add=True, + is_multipath=kwargs.get(u"multipath", False), route=None ) err_msg = f"Failed to add route(s) on host {node[u'host']}" @@ -656,11 +654,11 @@ class IPUtil: cmd = u"ip_table_add_del" table = dict( table_id=int(table_id), - is_ip6=int(ipv6) + is_ip6=ipv6 ) args = dict( table=table, - is_add=1 + is_add=True ) err_msg = f"Failed to add FIB table on host {node[u'host']}" diff --git a/resources/libraries/python/Tap.py b/resources/libraries/python/Tap.py index 19f60242cb..041a774c0b 100644 --- a/resources/libraries/python/Tap.py +++ b/resources/libraries/python/Tap.py @@ -13,7 +13,6 @@ """Tap utilities library.""" -from ipaddress import ip_address from robot.api import logger from resources.libraries.python.Constants import Constants @@ -27,33 +26,36 @@ class Tap: """Tap utilities.""" @staticmethod - def add_tap_interface(node, tap_name, mac=None): + def add_tap_interface(node, tap_name, mac=None, num_rx_queues=1): """Add tap interface with name and optionally with MAC. :param node: Node to add tap on. :param tap_name: Tap interface name for linux tap. :param mac: Optional MAC address for VPP tap. + :param num_rx_queues: Number of RX queues. :type node: dict :type tap_name: str :type mac: str + :type num_rx_queues: int :returns: Returns a interface index. :rtype: int """ cmd = u"tap_create_v2" args = dict( id=Constants.BITWISE_NON_ZERO, - use_random_mac=0 if mac else 1, - mac_address=L2Util.mac_to_bin(mac) if mac else 6 * b"\0", - host_namespace=64 * b"\0", - host_mac_addr=6 * b"\0", - host_if_name_set=1, - host_if_name=tap_name.encode(encoding=u"utf-8") + - (64 - len(tap_name)) * b"\0", - host_bridge=64 * b"\0", - host_ip4_addr=4 * b"\0", - host_ip6_addr=16 * b"\0", - host_ip4_gw=4 * b"\0", - host_ip6_gw=16 * b"\0" + use_random_mac=bool(mac is None), + mac_address=L2Util.mac_to_bin(mac) if mac else None, + num_rx_queues=int(num_rx_queues), + host_mtu_set=False, + host_mac_addr_set=False, + host_ip4_prefix_set=False, + host_ip6_prefix_set=False, + host_ip4_gw_set=False, + host_ip6_gw_set=False, + host_namespace_set=False, + host_if_name_set=True, + host_if_name=tap_name, + host_bridge_set=False ) err_msg = f"Failed to create tap interface {tap_name} " \ f"on host {node[u'host']}" @@ -119,11 +121,18 @@ class Tap: :returns: Processed tap interface dump. :rtype: dict """ - tap_dump[u"host_mac_addr"] = L2Util.bin_to_mac( - tap_dump[u"host_mac_addr"] - ) - tap_dump[u"host_ip4_addr"] = ip_address(tap_dump[u"host_ip4_addr"]) - tap_dump[u"host_ip6_addr"] = ip_address(tap_dump[u"host_ip6_addr"]) + tap_dump[u"host_mac_addr"] = str(tap_dump[u"host_mac_addr"]) + tap_dump[u"host_ip4_prefix"] = str(tap_dump[u"host_ip4_prefix"]) + tap_dump[u"host_ip6_prefix"] = str(tap_dump[u"host_ip6_prefix"]) + tap_dump[u"tap_flags"] = tap_dump[u"tap_flags"].value \ + if hasattr(tap_dump[u"tap_flags"], u"value") \ + else int(tap_dump[u"tap_flags"]) + tap_dump[u"host_namespace"] = None \ + if tap_dump[u"host_namespace"] == u"(nil)" \ + else tap_dump[u"host_namespace"] + tap_dump[u"host_bridge"] = None \ + if tap_dump[u"host_bridge"] == u"(nil)" \ + else tap_dump[u"host_bridge"] return tap_dump |