aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/python
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2019-01-30 14:04:40 +0000
committerPeter Mikus <pmikus@cisco.com>2019-02-04 12:43:02 +0000
commit1634e19d9adb70b634c80b760aabac81fd4bfdd1 (patch)
tree3684386fbdecf33bca2a69a1acd5455ed37848f0 /resources/libraries/python
parent9510e2ca6dbca1ab16b9db8054e9968facf4b699 (diff)
CSIT-1411 Implement manual rx-placement override for bug in VPP
Change-Id: Ie3d2b1f40a607ce5190ccfea6a372bc072d0a3b9 Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'resources/libraries/python')
-rw-r--r--resources/libraries/python/InterfaceUtil.py109
-rw-r--r--resources/libraries/python/VPPUtil.py33
2 files changed, 142 insertions, 0 deletions
diff --git a/resources/libraries/python/InterfaceUtil.py b/resources/libraries/python/InterfaceUtil.py
index cff2c9f695..8e1892392d 100644
--- a/resources/libraries/python/InterfaceUtil.py
+++ b/resources/libraries/python/InterfaceUtil.py
@@ -19,6 +19,8 @@ from robot.api import logger
from resources.libraries.python.CpuUtils import CpuUtils
from resources.libraries.python.DUTSetup import DUTSetup
+from resources.libraries.python.PapiExecutor import PapiExecutor
+from resources.libraries.python.PapiErrors import PapiError
from resources.libraries.python.IPUtil import convert_ipv4_netmask_prefix
from resources.libraries.python.IPUtil import IPUtil
from resources.libraries.python.parsers.JsonParser import JsonParser
@@ -1620,3 +1622,110 @@ class InterfaceUtil(object):
node, 'vlan_subif{nr}'.format(nr=subif_id)), bd_id=bd_id))
VatExecutor().write_and_execute_script(node, tmp_fn, commands)
+
+ @staticmethod
+ def vpp_sw_interface_rx_placement_dump(node):
+ """Dump VPP interface RX placement on node.
+
+ :param node: Node to run command on.
+ :type node: dict
+ :returns: Thread mapping information as a list of dictionaries.
+ :rtype: list
+ :raises RuntimeError: If failed to run command on host.
+ :raises PapiError: If no API reply received.
+ """
+ api_data = list()
+ for ifc in node['interfaces'].values():
+ if ifc['vpp_sw_index'] is not None:
+ api = dict(api_name='sw_interface_rx_placement_dump')
+ api_args = dict(sw_if_index=ifc['vpp_sw_index'])
+ api['api_args'] = api_args
+ api_data.append(api)
+
+ with PapiExecutor(node) as papi_executor:
+ papi_executor.execute_papi(api_data)
+ try:
+ papi_executor.papi_should_have_passed()
+ api_reply = papi_executor.get_papi_reply()
+ except AssertionError:
+ raise RuntimeError('Failed to run {api_name} on host '
+ '{host}!'.format(host=node['host'], **api))
+
+ if api_reply:
+ thr_mapping = [s['sw_interface_rx_placement_details'] \
+ for r in api_reply for s in r['api_reply']]
+ return sorted(thr_mapping, key=lambda k: k['sw_if_index'])
+ else:
+ raise PapiError('No reply received for {api_name} on host {host}!'.
+ format(host=node['host'], **api))
+
+ @staticmethod
+ def vpp_sw_interface_set_rx_placement(node, sw_if_index, queue_id,
+ worker_id):
+ """Set interface RX placement to worker on node.
+
+ :param node: Node to run command on.
+ :param sw_if_index: VPP SW interface index.
+ :param queue_id: VPP interface queue ID.
+ :param worker_id: VPP worker ID (indexing from 0).
+ :type node: dict
+ :type sw_if_index: int
+ :type queue_id: int
+ :type worker_id: int
+ :raises RuntimeError: If failed to run command on host.
+ :raises PapiError: If no API reply received.
+ """
+ api_data = list()
+ api = dict(api_name='sw_interface_set_rx_placement')
+ api_args = dict(sw_if_index=sw_if_index, queue_id=queue_id,
+ worker_id=worker_id)
+ api['api_args'] = api_args
+ api_data.append(api)
+
+ with PapiExecutor(node) as papi_executor:
+ papi_executor.execute_papi(api_data)
+ try:
+ papi_executor.papi_should_have_passed()
+ api_reply = papi_executor.get_papi_reply()
+ except AssertionError:
+ raise RuntimeError('Failed to run {api_name} on host '
+ '{host}!'.format(host=node['host'], **api))
+
+ if not api_reply:
+ raise PapiError('No reply received for {api_name} on host {host}!'.
+ format(host=node['host'], **api))
+
+ @staticmethod
+ def vpp_round_robin_rx_placement(node, prefix):
+ """Set Round Robin interface RX placement on all worker threads
+ on node.
+
+ :param node: Topology nodes.
+ :param prefix: Interface name prefix.
+ :type node: dict
+ :type prefix: str
+ """
+ worker_id = 0
+ worker_cnt = len(VPPUtil.vpp_show_threads(node)) - 1
+ for placement in InterfaceUtil.vpp_sw_interface_rx_placement_dump(node):
+ for interface in node['interfaces'].values():
+ if placement['sw_if_index'] == interface['vpp_sw_index'] \
+ and prefix in interface['name']:
+ InterfaceUtil.vpp_sw_interface_set_rx_placement(
+ node, placement['sw_if_index'], placement['queue_id'],
+ worker_id % worker_cnt)
+ worker_id += 1
+
+ @staticmethod
+ def vpp_round_robin_rx_placement_on_all_duts(nodes, prefix):
+ """Set Round Robin interface RX placement on all worker threads
+ on all DUTs.
+
+ :param nodes: Topology nodes.
+ :param prefix: Interface name prefix.
+ :type nodes: dict
+ :type prefix: str
+ """
+ for node in nodes.values():
+ if node['type'] == NodeType.DUT:
+ InterfaceUtil.vpp_round_robin_rx_placement(node, prefix)
diff --git a/resources/libraries/python/VPPUtil.py b/resources/libraries/python/VPPUtil.py
index 63d9aaca86..82fded30b4 100644
--- a/resources/libraries/python/VPPUtil.py
+++ b/resources/libraries/python/VPPUtil.py
@@ -317,3 +317,36 @@ class VPPUtil(object):
for node in nodes.values():
if node['type'] == NodeType.DUT:
VPPUtil.show_event_logger_on_dut(node)
+
+ @staticmethod
+ def vpp_show_threads(node):
+ """Show VPP threads on node.
+
+ :param node: Node to run command on.
+ :type node: dict
+ :returns: VPP thread data.
+ :rtype: list
+ :raises RuntimeError: If failed to run command on host.
+ :raises PapiError: If no API reply received.
+ """
+ api_data = list()
+ api = dict(api_name='show_threads')
+ api_args = dict()
+ api['api_args'] = api_args
+ api_data.append(api)
+
+ with PapiExecutor(node) as papi_executor:
+ papi_executor.execute_papi(api_data)
+ try:
+ papi_executor.papi_should_have_passed()
+ api_reply = papi_executor.get_papi_reply()
+ except AssertionError:
+ raise RuntimeError('Failed to run {api_name} on host '
+ '{host}!'.format(host=node['host'], **api))
+
+ if api_reply:
+ return \
+ api_reply[0]['api_reply']['show_threads_reply']['thread_data']
+ else:
+ raise PapiError('No reply received for {api_name} on host {host}!'.
+ format(host=node['host'], **api))