import time
from resources.libraries.python.ssh import SSH
+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
path = ['dpdk', 'dev default', 'num-tx-desc']
self.add_config_item(self._nodeconfig, value, path)
+ def add_dpdk_log_level(self, value):
+ """Add DPDK log-level configuration.
+
+ :param value: Log level.
+ :type value: str
+ """
+ path = ['dpdk', 'log-level']
+ self.add_config_item(self._nodeconfig, value, path)
+
def add_dpdk_socketmem(self, value):
"""Add DPDK socket memory configuration.
path = ['ip', 'heap-size']
self.add_config_item(self._nodeconfig, value, path)
- def add_plugin_disable(self, *plugins):
- """Add plugin disable for specific plugin.
+ def add_plugin(self, state, *plugins):
+ """Add plugin section for specific plugin(s).
+ :param state: State of plugin [enable|disable].
:param plugins: Plugin(s) to disable.
+ :type state: str
:type plugins: list
"""
for plugin in plugins:
- path = ['plugins', 'plugin {0}'.format(plugin), 'disable']
+ path = ['plugins', 'plugin {0}'.format(plugin), state]
self.add_config_item(self._nodeconfig, ' ', path)
def add_dpdk_no_multi_seg(self):
path = ['dpdk', 'no-multi-seg']
self.add_config_item(self._nodeconfig, '', path)
+ def add_dpdk_no_tx_checksum_offload(self):
+ """Add DPDK no-tx-checksum-offload configuration."""
+ path = ['dpdk', 'no-tx-checksum-offload']
+ self.add_config_item(self._nodeconfig, '', path)
+
def add_nat(self, value='deterministic'):
"""Add NAT configuration.
path = ['session', 'local-endpoints-table-memory']
self.add_config_item(self._nodeconfig, value, path)
- def apply_config(self, filename=None, waittime=5,
- retries=12, restart_vpp=True):
+ def apply_config(self, filename=None, retries=60, restart_vpp=True):
"""Generate and apply VPP configuration for node.
Use data from calls to this class to form a startup.conf file and
replace /etc/vpp/startup.conf with it on node.
:param filename: Startup configuration file name.
- :param waittime: Time to wait for VPP to restart (default 5 seconds).
- :param retries: Number of times (default 12) to re-try waiting.
+ :param retries: Number of times (default 60) to re-try waiting.
:param restart_vpp: Whether to restart VPP.
:type filename: str
- :type waittime: int
:type retries: int
:type restart_vpp: bool.
:raises RuntimeError: If writing config file failed or restart of VPP
filename = self._vpp_startup_conf
if self._vpp_startup_conf_backup is not None:
- (ret, _, _) = \
- ssh.exec_command('sudo cp {0} {1}'.
- format(self._vpp_startup_conf,
- self._vpp_startup_conf_backup))
+ ret, _, _ = \
+ ssh.exec_command('sudo cp {src} {dest}'.
+ format(src=self._vpp_startup_conf,
+ dest=self._vpp_startup_conf_backup))
if ret != 0:
- raise RuntimeError('Backup of config file failed on node {}'.
- format(self._hostname))
+ raise RuntimeError('Backup of config file failed on node '
+ '{name}'.format(name=self._hostname))
- (ret, _, _) = \
+ ret, _, _ = \
ssh.exec_command('echo "{config}" | sudo tee {filename}'.
format(config=self._vpp_config,
filename=filename))
if ret != 0:
- raise RuntimeError('Writing config file failed to node {}'.
- format(self._hostname))
+ raise RuntimeError('Writing config file failed to node {name}'.
+ format(name=self._hostname))
if restart_vpp:
- # Instead of restarting, we'll do separate start and stop
- # actions. This way we don't care whether VPP was running
- # to begin with.
- ssh.exec_command('sudo service {} stop'
- .format(self._vpp_service_name))
- (ret, _, _) = \
- ssh.exec_command('sudo service {} start'
- .format(self._vpp_service_name))
- if ret != 0:
- raise RuntimeError('Restarting VPP failed on node {}'.
- format(self._hostname))
+ DUTSetup.start_service(self._node, Constants.VPP_UNIT)
# Sleep <waittime> seconds, up to <retry> times,
# and verify if VPP is running.
for _ in range(retries):
- time.sleep(waittime)
- (ret, stdout, _) = \
- ssh.exec_command('echo show hardware-interfaces | '
- 'nc 0 5002 || echo "VPP not yet running"')
- if ret == 0 and stdout != 'VPP not yet running':
+ 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:
break
else:
- raise RuntimeError('VPP failed to restart on node {}'.
- format(self._hostname))
+ raise RuntimeError('VPP failed to restart on node {name}'.
+ format(name=self._hostname))
def restore_config(self):
"""Restore VPP startup.conf from backup.
ssh = SSH()
ssh.connect(self._node)
- (ret, _, _) = ssh.exec_command('sudo cp {0} {1}'.
- format(self._vpp_startup_conf_backup,
- self._vpp_startup_conf))
+ ret, _, _ = ssh.exec_command('sudo cp {src} {dest}'.
+ format(src=self._vpp_startup_conf_backup,
+ dest=self._vpp_startup_conf))
if ret != 0:
- raise RuntimeError('Restoration of config file failed on node {}'.
- format(self._hostname))
+ raise RuntimeError('Restoration of config file failed on node '
+ '{name}'.format(name=self._hostname))