X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FVppConfigGenerator.py;h=350e1c0881ee661cc5de17663df3a530c47a06ee;hp=e9933f2a18f8afc403aaa64fccfcb95e5d91102e;hb=0b0b14fb00fbaab5eb2745657d741084fe2e1de2;hpb=b5782684055409315412d94d1de2e5f78cffac4d diff --git a/resources/libraries/python/VppConfigGenerator.py b/resources/libraries/python/VppConfigGenerator.py index e9933f2a18..350e1c0881 100644 --- a/resources/libraries/python/VppConfigGenerator.py +++ b/resources/libraries/python/VppConfigGenerator.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: @@ -17,7 +17,7 @@ import re import time from resources.libraries.python.ssh import SSH -from resources.libraries.python.constants import Constants +from resources.libraries.python.Constants import Constants from resources.libraries.python.DUTSetup import DUTSetup from resources.libraries.python.topology import NodeType from resources.libraries.python.topology import Topology @@ -26,20 +26,20 @@ __all__ = ['VppConfigGenerator'] def pci_dev_check(pci_dev): - """Check if provided PCI address is in correct format. - - :param pci_dev: PCI address (expected format: xxxx:xx:xx.x). - :type pci_dev: str - :returns: True if PCI address is in correct format. - :rtype: bool - :raises ValueError: If PCI address is in incorrect format. - """ - pattern = re.compile("^[0-9A-Fa-f]{4}:[0-9A-Fa-f]{2}:" - "[0-9A-Fa-f]{2}\\.[0-9A-Fa-f]$") - if not pattern.match(pci_dev): - raise ValueError('PCI address {addr} is not in valid format ' - 'xxxx:xx:xx.x'.format(addr=pci_dev)) - return True + """Check if provided PCI address is in correct format. + + :param pci_dev: PCI address (expected format: xxxx:xx:xx.x). + :type pci_dev: str + :returns: True if PCI address is in correct format. + :rtype: bool + :raises ValueError: If PCI address is in incorrect format. + """ + pattern = re.compile("^[0-9A-Fa-f]{4}:[0-9A-Fa-f]{2}:" + "[0-9A-Fa-f]{2}\\.[0-9A-Fa-f]$") + if not pattern.match(pci_dev): + raise ValueError('PCI address {addr} is not in valid format ' + 'xxxx:xx:xx.x'.format(addr=pci_dev)) + return True class VppConfigGenerator(object): @@ -160,7 +160,7 @@ class VppConfigGenerator(object): value = self._vpp_logfile self.add_config_item(self._nodeconfig, value, path) - def add_unix_cli_listen(self, value='localhost:5002'): + def add_unix_cli_listen(self, value='/run/vpp/cli.sock'): """Add UNIX cli-listen configuration. :param value: CLI listen address and port or path to CLI socket. @@ -220,6 +220,15 @@ class VppConfigGenerator(object): path = ['api-segment', 'api-size'] self.add_config_item(self._nodeconfig, value, path) + def add_buffers_per_numa(self, value): + """Increase number of buffers allocated. + + :param value: Number of buffers allocated. + :type value: int + """ + path = ['buffers', 'buffers-per-numa'] + self.add_config_item(self._nodeconfig, value, path) + def add_dpdk_dev(self, *devices): """Add DPDK PCI device configuration. @@ -343,21 +352,21 @@ class VppConfigGenerator(object): path = ['dpdk', 'log-level'] self.add_config_item(self._nodeconfig, value, path) - def add_dpdk_socketmem(self, value): - """Add DPDK socket memory configuration. - - :param value: Socket memory size. - :type value: str - """ - path = ['dpdk', 'socket-mem'] - self.add_config_item(self._nodeconfig, value, path) + def add_dpdk_no_pci(self): + """Add DPDK no-pci.""" + path = ['dpdk', 'no-pci'] + self.add_config_item(self._nodeconfig, '', path) - def add_dpdk_uio_driver(self, value): + def add_dpdk_uio_driver(self, value=None): """Add DPDK uio-driver configuration. - :param value: DPDK uio-driver configuration. + :param value: DPDK uio-driver configuration. By default, driver will be + loaded automatically from Topology file, still leaving + option to manually override by parameter. :type value: str """ + if value is None: + value = Topology.get_uio_driver(self._node) path = ['dpdk', 'uio-driver'] self.add_config_item(self._nodeconfig, value, path) @@ -420,6 +429,15 @@ class VppConfigGenerator(object): path = ['ip', 'heap-size'] self.add_config_item(self._nodeconfig, value, path) + def add_statseg_size(self, value): + """Add stats segment heap size configuration. + + :param value: Stats heapsize amount. + :type value: str + """ + path = ['statseg', 'size'] + self.add_config_item(self._nodeconfig, value, path) + def add_plugin(self, state, *plugins): """Add plugin section for specific plugin(s). @@ -590,9 +608,8 @@ class VppConfigGenerator(object): for _ in range(retries): time.sleep(1) ret, stdout, _ = \ - ssh.exec_command('echo show pci | nc 0 5002 || ' - 'echo "VPP not yet running"') - if ret == 0 and 'VPP not yet running' not in stdout: + ssh.exec_command_sudo('vppctl show pci') + if ret == 0 and 'Connection refused' not in stdout: break else: raise RuntimeError('VPP failed to restart on node {name}'.