X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FVPPUtil.py;h=72b61423067838c9f238617fe981f8c5a1ba43b4;hb=3ccfe8cdb3d94182e365f4bfacefbb52fb32cb93;hp=432a589cd35c5fa932cdbf585ea7285953a1cc19;hpb=96eaabff284f154ca96ce823fee205bd9833043b;p=csit.git diff --git a/resources/libraries/python/VPPUtil.py b/resources/libraries/python/VPPUtil.py index 432a589cd3..72b6142306 100644 --- a/resources/libraries/python/VPPUtil.py +++ b/resources/libraries/python/VPPUtil.py @@ -259,10 +259,10 @@ class VPPUtil(object): VPPUtil.vpp_enable_traces_on_dut(node, fail_on_error) @staticmethod - def vpp_enable_elog_traces_on_dut(node): - """Enable API/CLI/Barrier traces on the DUT node. + def vpp_enable_elog_traces(node): + """Enable API/CLI/Barrier traces on the specified topology node. - :param node: DUT node to set up. + :param node: Topology node. :type node: dict """ PapiSocketExecutor.run_cli_cmd(node, "elog trace api cli barrier") @@ -276,13 +276,13 @@ class VPPUtil(object): """ for node in nodes.values(): if node['type'] == NodeType.DUT: - VPPUtil.vpp_enable_elog_traces_on_dut(node) + VPPUtil.vpp_enable_elog_traces(node) @staticmethod - def show_event_logger_on_dut(node): - """Show event logger on the DUT node. + def show_event_logger(node): + """Show event logger on the specified topology node. - :param node: DUT node to show traces on. + :param node: Topology node. :type node: dict """ PapiSocketExecutor.run_cli_cmd(node, "show event-logger") @@ -296,18 +296,27 @@ class VPPUtil(object): """ for node in nodes.values(): if node['type'] == NodeType.DUT: - VPPUtil.show_event_logger_on_dut(node) + VPPUtil.show_event_logger(node) @staticmethod def show_log(node): - """Show log on the specified topology node. + """Show logging on the specified topology node. :param node: Topology node. :type node: dict - :returns: VPP log data. - :rtype: list """ - return PapiSocketExecutor.run_cli_cmd(node, "show log") + PapiSocketExecutor.run_cli_cmd(node, "show logging") + + @staticmethod + def show_log_on_all_duts(nodes): + """Show logging on all DUTs in the given topology. + + :param nodes: Nodes in the topology. + :type nodes: dict + """ + for node in nodes.values(): + if node['type'] == NodeType.DUT: + VPPUtil.show_log(node) @staticmethod def vpp_show_threads(node): @@ -331,6 +340,6 @@ class VPPUtil(object): thread_data.append(item) threads_data.append(thread_data) - logger.info("show threads:\n{threads}".format(threads=threads_data)) + logger.trace("show threads:\n{threads}".format(threads=threads_data)) return threads_data