X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FVPPUtil.py;h=5b7728412e2fad4119419286e1f100228a4960bc;hp=f6b3afae289f630e670fc64c01a8de44c81313e6;hb=e001fdea995835f1ef75a5e21607ba02d78e4068;hpb=424749b09ac91c4eb5eabdd8bdd9d34b8c130783 diff --git a/resources/libraries/python/VPPUtil.py b/resources/libraries/python/VPPUtil.py index f6b3afae28..5b7728412e 100644 --- a/resources/libraries/python/VPPUtil.py +++ b/resources/libraries/python/VPPUtil.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Cisco and/or its affiliates. +# Copyright (c) 2019 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -12,8 +12,12 @@ # limitations under the License. """VPP util library.""" -from resources.libraries.python.constants import Constants + +from robot.api import logger + +from resources.libraries.python.Constants import Constants from resources.libraries.python.DUTSetup import DUTSetup +from resources.libraries.python.PapiExecutor import PapiExecutor from resources.libraries.python.ssh import exec_cmd_no_error from resources.libraries.python.topology import NodeType from resources.libraries.python.VatExecutor import VatExecutor @@ -52,95 +56,133 @@ class VPPUtil(object): exec_cmd_no_error(node, command, timeout=30, sudo=True) @staticmethod - def start_vpp_service(node): - """Start VPP service on the specified node. + def restart_vpp_service(node): + """Restart VPP service on the specified topology node. - :param node: VPP node. + :param node: Topology node. :type node: dict - :raises RuntimeError: If VPP service fails to start. """ - DUTSetup.start_service(node, Constants.VPP_UNIT) - DUTSetup.get_service_logs(node, Constants.VPP_UNIT) + DUTSetup.restart_service(node, Constants.VPP_UNIT) @staticmethod - def start_vpp_service_on_all_duts(nodes): - """Start up the VPP service on all nodes. + def restart_vpp_service_on_all_duts(nodes): + """Restart VPP service on all DUT nodes. - :param nodes: Nodes in the topology. + :param nodes: Topology nodes. :type nodes: dict """ - DUTSetup.start_service_on_all_duts(nodes, Constants.VPP_UNIT) + for node in nodes.values(): + if node['type'] == NodeType.DUT: + VPPUtil.restart_vpp_service(node) @staticmethod def stop_vpp_service(node): - """Stop VPP service on the specified node. + """Stop VPP service on the specified topology node. - :param node: VPP node. + :param node: Topology node. :type node: dict - :raises RuntimeError: If VPP service fails to stop. """ DUTSetup.stop_service(node, Constants.VPP_UNIT) @staticmethod def stop_vpp_service_on_all_duts(nodes): - """Stop VPP service on all nodes. + """Stop VPP service on all DUT nodes. - :param nodes: Nodes in the topology. + :param nodes: Topology nodes. :type nodes: dict """ - DUTSetup.stop_service_on_all_duts(nodes, Constants.VPP_UNIT) + for node in nodes.values(): + if node['type'] == NodeType.DUT: + VPPUtil.stop_vpp_service(node) + + @staticmethod + def verify_vpp_installed(node): + """Verify that VPP is installed on the specified topology node. + + :param node: Topology node. + :type node: dict + """ + cmd = 'command -v vpp' + exec_cmd_no_error( + node, cmd, message='VPP is not installed!') + + @staticmethod + def verify_vpp_started(node): + """Verify that VPP is started on the specified topology node. + + :param node: Topology node. + :type node: dict + """ + cmd = ('vppctl show pci 2>&1 | ' + 'fgrep -v "Connection refused" | ' + 'fgrep -v "No such file or directory"') + exec_cmd_no_error( + node, cmd, sudo=True, message='VPP failed to start!', retries=120) @staticmethod - def verify_vpp_on_dut(node): - """Verify that VPP is installed on DUT node. + def verify_vpp(node): + """Verify that VPP is installed and started on the specified topology + node. - :param node: DUT node. + :param node: Topology node. :type node: dict - :raises RuntimeError: If failed to restart VPP, get VPP version - or get VPP interfaces. + :raises RuntimeError: If VPP service fails to start. """ - VPPUtil.vpp_show_version_verbose(node) - VPPUtil.vpp_show_interfaces(node) + VPPUtil.verify_vpp_installed(node) + try: + # Verify responsivness of vppctl. + VPPUtil.verify_vpp_started(node) + # Verify responsivness of PAPI. + VPPUtil.show_log(node) + finally: + DUTSetup.get_service_logs(node, Constants.VPP_UNIT) @staticmethod def verify_vpp_on_all_duts(nodes): - """Verify that VPP is installed on all DUT nodes. + """Verify that VPP is installed and started on all DUT nodes. :param nodes: Nodes in the topology. :type nodes: dict """ for node in nodes.values(): if node['type'] == NodeType.DUT: - DUTSetup.start_service(node, Constants.VPP_UNIT) - VPPUtil.vpp_show_version_verbose(node) - VPPUtil.vpp_show_interfaces(node) + VPPUtil.verify_vpp(node) @staticmethod - def vpp_show_version_verbose(node): - """Run "show version verbose" CLI command. + def vpp_show_version(node, verbose=True): + """Run "show_version" PAPI command. :param node: Node to run command on. + :param verbose: Show version, compile date and compile location if True + otherwise show only version. :type node: dict + :type verbose: bool + :returns: VPP version. + :rtype: str """ - vat = VatExecutor() - vat.execute_script("show_version_verbose.vat", node, json_out=False) - - try: - vat.script_should_have_passed() - except AssertionError: - raise RuntimeError('Failed to get VPP version on host: {name}'. - format(name=node['host'])) + with PapiExecutor(node) as papi_exec: + data = papi_exec.add('show_version').execute_should_pass().\ + verify_reply() + version = ('VPP version: {ver}\n'. + format(ver=data['version'].rstrip('\0x00'))) + if verbose: + version += ('Compile date: {date}\n' + 'Compile location: {cl}\n '. + format(date=data['build_date'].rstrip('\0x00'), + cl=data['build_directory'].rstrip('\0x00'))) + logger.info(version) + return data['version'].rstrip('\0x00') @staticmethod def show_vpp_version_on_all_duts(nodes): """Show VPP version verbose on all DUTs. - :param nodes: VPP nodes. + :param nodes: Nodes in the topology. :type nodes: dict """ for node in nodes.values(): if node['type'] == NodeType.DUT: - VPPUtil.vpp_show_version_verbose(node) + VPPUtil.vpp_show_version(node) @staticmethod def vpp_show_interfaces(node): @@ -169,26 +211,6 @@ class VPPUtil(object): vat.execute_script("show_crypto_device_mapping.vat", node, json_out=False) - @staticmethod - def vpp_api_trace_dump(node): - """Run "api trace custom-dump" CLI command. - - :param node: Node to run command on. - :type node: dict - """ - vat = VatExecutor() - vat.execute_script("api_trace_dump.vat", node, json_out=False) - - @staticmethod - def vpp_api_trace_save(node): - """Run "api trace save" CLI command. - - :param node: Node to run command on. - :type node: dict - """ - vat = VatExecutor() - vat.execute_script("api_trace_save.vat", node, json_out=False) - @staticmethod def vpp_enable_traces_on_dut(node): """Enable vpp packet traces on the DUT node. @@ -213,26 +235,26 @@ class VPPUtil(object): VPPUtil.vpp_enable_traces_on_dut(node) @staticmethod - def vpp_enable_barrier_traces_on_dut(node): - """Enable vpp barrier traces on the DUT node. + def vpp_enable_elog_traces_on_dut(node): + """Enable API/CLI/Barrier traces on the DUT node. :param node: DUT node to set up. :type node: dict """ vat = VatExecutor() - vat.execute_script("test_threads_barrier_elog.vat", node, + vat.execute_script("elog_trace_api_cli_barrier.vat", node, json_out=False) @staticmethod - def vpp_enable_barrier_traces_on_all_duts(nodes): - """Enable vpp barrier traces on all DUTs in the given topology. + def vpp_enable_elog_traces_on_all_duts(nodes): + """Enable API/CLI/Barrier traces 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.vpp_enable_barrier_traces_on_dut(node) + VPPUtil.vpp_enable_elog_traces_on_dut(node) @staticmethod def show_event_logger_on_dut(node): @@ -253,4 +275,30 @@ class VPPUtil(object): """ for node in nodes.values(): if node['type'] == NodeType.DUT: - VPPUtil.show_event_logger_on_dut(node) \ No newline at end of file + VPPUtil.show_event_logger_on_dut(node) + + @staticmethod + def show_log(node): + """Show log on the specified topology node. + + :param node: Topology node. + :type node: dict + :returns: VPP log data. + :rtype: list + """ + with PapiExecutor(node) as papi_exec: + return papi_exec.add('cli_inband', cmd='show log').get_replies().\ + verify_reply()["reply"] + + @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 + """ + with PapiExecutor(node) as papi_exec: + return papi_exec.add('show_threads').execute_should_pass().\ + verify_reply()["thread_data"]