{txqueuesconfig}
}}
{pciconfig}
+ {cryptodevconfig}
+ {uiodriverconfig}
{nomultiseg}
+{enablevhostuser}
}}
+
+ip6 {{
+ hash-buckets 2000000
+ heap-size 3G
+}}
+{snatconfig}
"""
# End VPP configuration template.
def __init__(self):
self._nodeconfig = {}
- def add_pci_device(self, node, pci_device=None):
+ def add_pci_all_devices(self, node):
+ """Add all PCI devices from topology file to startup config
+
+ :param node: DUT node
+ :type node: dict
+ :returns: nothing
+ """
+ for port in node['interfaces'].keys():
+ pci_addr = Topology.get_interface_pci_addr(node, port)
+ if pci_addr:
+ self.add_pci_device(node, pci_addr)
+
+ def add_pci_device(self, node, *pci_devices):
"""Add PCI device configuration for node.
:param node: DUT node.
- :param pci_device: PCI device (format 0000:00:00.0 or 00:00.0).
- If none given, all PCI devices for this node as per topology will be
- added.
+ :param pci_devices: PCI devices (format 0000:00:00.0 or 00:00.0)
:type node: dict
- :type pci_device: str
- :return: nothing
+ :type pci_devices: tuple
+ :returns: nothing
"""
if node['type'] != NodeType.DUT:
raise ValueError('Node type is not a DUT')
- if pci_device is None:
- # No PCI device was given. Add all device from topology.
- for port in node['interfaces'].values():
- port_name = port.get('name')
- pci_addr = Topology.get_interface_pci_addr(node, port_name)
- if pci_addr:
- self.add_pci_device(node, pci_addr)
- else:
- # Specific device was given.
- hostname = Topology.get_node_hostname(node)
-
- pattern = re.compile("^[0-9A-Fa-f]{4}:[0-9A-Fa-f]{2}:"
- "[0-9A-Fa-f]{2}\\.[0-9A-Fa-f]$")
+ # Specific device was given.
+ hostname = Topology.get_node_hostname(node)
+
+ pattern = re.compile("^[0-9A-Fa-f]{4}:[0-9A-Fa-f]{2}:"
+ "[0-9A-Fa-f]{2}\\.[0-9A-Fa-f]$")
+ for pci_device in pci_devices:
if not pattern.match(pci_device):
raise ValueError('PCI address {} to be added to host {} '
'is not in valid format xxxx:xx:xx.x'.
:param cpu_config: CPU configuration option, as a string.
:type node: dict
:type cpu_config: str
- :return: nothing
+ :returns: nothing
"""
if node['type'] != NodeType.DUT:
raise ValueError('Node type is not a DUT')
as a string.
:type node: dict
:type socketmem_config: str
- :return: nothing
+ :returns: nothing
"""
if node['type'] != NodeType.DUT:
raise ValueError('Node type is not a DUT')
:param heapsize_config: Heap Size configuration, as a string.
:type node: dict
:type heapsize_config: str
- :return: nothing
+ :returns: nothing
"""
if node['type'] != NodeType.DUT:
raise ValueError('Node type is not a DUT')
:param rxqueues_config: Rxqueues configuration, as a string.
:type node: dict
:type rxqueues_config: str
- :return: nothing
+ :returns: nothing
"""
if node['type'] != NodeType.DUT:
raise ValueError('Node type is not a DUT')
hostname = Topology.get_node_hostname(node)
- if not hostname in self._nodeconfig:
+ if hostname not in self._nodeconfig:
self._nodeconfig[hostname] = {}
- if not 'rxqueues_config' in self._nodeconfig[hostname]:
+ if 'rxqueues_config' not in self._nodeconfig[hostname]:
self._nodeconfig[hostname]['rxqueues_config'] = []
self._nodeconfig[hostname]['rxqueues_config'].append(rxqueues_config)
- logger.debug('Setting hostname {} rxqueues config to {}'.\
- format(hostname, rxqueues_config))
+ logger.debug('Setting hostname {} rxqueues config to {}'.
+ format(hostname, rxqueues_config))
def add_no_multi_seg_config(self, node):
"""Add No Multi Seg configuration for node.
:param node: DUT node.
:type node: dict
- :return: nothing
+ :returns: nothing
"""
if node['type'] != NodeType.DUT:
raise ValueError('Node type is not a DUT')
hostname = Topology.get_node_hostname(node)
- if not hostname in self._nodeconfig:
+ if hostname not in self._nodeconfig:
self._nodeconfig[hostname] = {}
- if not 'no_multi_seg_config' in self._nodeconfig[hostname]:
+ if 'no_multi_seg_config' not in self._nodeconfig[hostname]:
self._nodeconfig[hostname]['no_multi_seg_config'] = []
- self._nodeconfig[hostname]['no_multi_seg_config'].append(
- "no-multi-seg")
- logger.debug('Setting hostname {} config with {}'.\
- format(hostname, "no-multi-seg"))
+ self._nodeconfig[hostname]['no_multi_seg_config'].append("no-multi-seg")
+ logger.debug('Setting hostname {} config with {}'.
+ format(hostname, "no-multi-seg"))
+
+ def add_enable_vhost_user_config(self, node):
+ """Add enable-vhost-user configuration for node.
+
+ :param node: DUT node.
+ :type node: dict
+ :returns: nothing
+ """
+ if node['type'] != NodeType.DUT:
+ raise ValueError('Node type is not a DUT')
+ hostname = Topology.get_node_hostname(node)
+ if hostname not in self._nodeconfig:
+ self._nodeconfig[hostname] = {}
+ if 'enable_vhost_user' not in self._nodeconfig[hostname]:
+ self._nodeconfig[hostname]['enable_vhost_user'] = []
+ self._nodeconfig[hostname]['enable_vhost_user'].\
+ append("enable-vhost-user")
+ logger.debug('Setting hostname {} config with {}'.
+ format(hostname, "enable-vhost-user"))
+
+ def add_snat_config(self, node):
+ """Add SNAT configuration for the node.
+
+ :param node: DUT node.
+ :type node: dict
+ :returns: nothing
+ """
+ if node['type'] != NodeType.DUT:
+ raise ValueError('Node type is not a DUT')
+ hostname = Topology.get_node_hostname(node)
+ if hostname not in self._nodeconfig:
+ self._nodeconfig[hostname] = {}
+ if 'snat_config' not in self._nodeconfig[hostname]:
+ self._nodeconfig[hostname]['snat_config'] = []
+ self._nodeconfig[hostname]['snat_config'].append("deterministic")
+ logger.debug('Setting hostname {} config with {}'.
+ format(hostname, "SNAT"))
+
+ def add_cryptodev_config(self, node, count):
+ """Add cryptodev configuration for node.
+
+ :param node: DUT node.
+ :param count: Number of crypto device to add.
+ :type node: dict
+ :type count: int
+ :returns: nothing
+ :raises ValueError: If node type is not a DUT
+ """
+ if node['type'] != NodeType.DUT:
+ raise ValueError('Node type is not a DUT')
+ hostname = Topology.get_node_hostname(node)
+ if hostname not in self._nodeconfig:
+ self._nodeconfig[hostname] = {}
+
+ cryptodev = Topology.get_cryptodev(node)
+ cryptodev_config = 'enable-cryptodev'
+
+ for i in range(count):
+ cryptodev_config += ' dev {}'.format(\
+ re.sub(r'\d.\d$', '1.'+str(i), cryptodev))
+
+ self._nodeconfig[hostname]['cryptodev_config'] = cryptodev_config
+ logger.debug('Setting hostname {} Cryptodev config to {}'.
+ format(hostname, cryptodev_config))
+
+ uio_driver_config = 'uio-driver {}'.\
+ format(Topology.get_uio_driver(node))
+
+ self._nodeconfig[hostname]['uio_driver_config'] = uio_driver_config
+ logger.debug('Setting hostname {} uio_driver config to {}'.
+ format(hostname, uio_driver_config))
def remove_all_pci_devices(self, node):
"""Remove PCI device configuration from node.
:param node: DUT node.
:type node: dict
- :return: nothing
+ :returns: nothing
"""
if node['type'] != NodeType.DUT:
raise ValueError('Node type is not a DUT')
:param node: DUT node.
:type node: dict
- :return: nothing
+ :returns: nothing
"""
if node['type'] != NodeType.DUT:
raise ValueError('Node type is not a DUT')
:param node: DUT node.
:type node: dict
- :return: nothing
+ :returns: nothing
"""
if node['type'] != NodeType.DUT:
raise ValueError('Node type is not a DUT')
logger.debug('Clearing Socket Memory config for hostname {}.'.
format(hostname))
+ def remove_cryptodev_config(self, node):
+ """Remove Cryptodev configuration from node.
+
+ :param node: DUT node.
+ :type node: dict
+ :returns: nothing
+ :raises ValueError: If node type is not a DUT
+ """
+ if node['type'] != NodeType.DUT:
+ raise ValueError('Node type is not a DUT')
+ hostname = Topology.get_node_hostname(node)
+ if hostname in self._nodeconfig:
+ self._nodeconfig[hostname].pop('cryptodev_config', None)
+ logger.debug('Clearing Cryptodev config for hostname {}.'.
+ format(hostname))
+
def remove_heapsize_config(self, node):
"""Remove Heap Size configuration from node.
:param node: DUT node.
:type node: dict
- :return: nothing
+ :returns: nothing
"""
if node['type'] != NodeType.DUT:
raise ValueError('Node type is not a DUT')
:param node: DUT node.
:type node: dict
- :return: nothing
+ :returns: nothing
"""
if node['type'] != NodeType.DUT:
raise ValueError('Node type is not a DUT')
hostname = Topology.get_node_hostname(node)
if hostname in self._nodeconfig:
self._nodeconfig[hostname]['rxqueues_config'] = []
- logger.debug('Clearing rxqueues config for hostname {}.'.\
- format(hostname))
+ logger.debug('Clearing rxqueues config for hostname {}.'.
+ format(hostname))
def remove_no_multi_seg_config(self, node):
"""Remove No Multi Seg configuration from node.
:param node: DUT node.
:type node: dict
- :return: nothing
+ :returns: nothing
"""
if node['type'] != NodeType.DUT:
raise ValueError('Node type is not a DUT')
hostname = Topology.get_node_hostname(node)
if hostname in self._nodeconfig:
self._nodeconfig[hostname]['no_multi_seg_config'] = []
- logger.debug('Clearing No Multi Seg config for hostname {}.'.\
- format(hostname))
+ logger.debug('Clearing No Multi Seg config for hostname {}.'.
+ format(hostname))
+
+ def remove_enable_vhost_user_config(self, node):
+ """Remove enable-vhost-user configuration from node.
+
+ :param node: DUT node.
+ :type node: dict
+ :returns: nothing
+ """
+ if node['type'] != NodeType.DUT:
+ raise ValueError('Node type is not a DUT')
+ hostname = Topology.get_node_hostname(node)
+ if hostname in self._nodeconfig:
+ self._nodeconfig[hostname]['enable_vhost_user'] = []
+ logger.debug('Clearing enable-vhost-user config for hostname {}.'.
+ format(hostname))
+
+ def remove_snat_config(self, node):
+ """Remove SNAT configuration for the node.
+
+ :param node: DUT node.
+ :type node: dict
+ :returns: nothing
+ """
+ if node['type'] != NodeType.DUT:
+ raise ValueError('Node type is not a DUT')
+ hostname = Topology.get_node_hostname(node)
+ if hostname in self._nodeconfig:
+ self._nodeconfig[hostname]['snat_config'] = []
+ logger.debug('Clearing SNAT config for hostname {}.'.format(hostname))
def apply_config(self, node, waittime=5, retries=12):
"""Generate and apply VPP configuration for node.
:type node: dict
:type waittime: int
:type retries: int
+ :raises RuntimeError: If writing config file failed, or restarting of
+ VPP failed.
"""
if node['type'] != NodeType.DUT:
rxqueuesconfig = ""
txqueuesconfig = ""
nomultiseg = ""
+ enablevhostuser = ""
+ cryptodevconfig = ""
+ uiodriverconfig = ""
+ snatconfig = ""
if hostname in self._nodeconfig:
cfg = self._nodeconfig[hostname]
if 'socketmem_config' in cfg:
socketmemconfig = cfg['socketmem_config']
+ if 'cryptodev_config' in cfg:
+ cryptodevconfig = cfg['cryptodev_config']
+
+ if 'uio_driver_config' in cfg:
+ uiodriverconfig = cfg['uio_driver_config']
+
if 'heapsize_config' in cfg:
heapsizeconfig = "\nheapsize {}\n".\
format(cfg['heapsize_config'])
if 'no_multi_seg_config' in cfg:
nomultiseg = " " + "\n ".join(cfg['no_multi_seg_config'])
+ if 'enable_vhost_user' in cfg:
+ enablevhostuser = " " + "\n ".join(cfg['enable_vhost_user'])
+
+ if 'snat_config' in cfg:
+ snatconfig = "snat {\n"
+ snatconfig += " " + "\n ".join(cfg['snat_config'])
+ snatconfig += "\n}"
+
vppconfig = VPP_CONFIG_TEMPLATE.format(cpuconfig=cpuconfig,
pciconfig=pciconfig,
+ cryptodevconfig=cryptodevconfig,
+ uiodriverconfig=uiodriverconfig,
socketmemconfig=socketmemconfig,
heapsizeconfig=heapsizeconfig,
rxqueuesconfig=rxqueuesconfig,
txqueuesconfig=txqueuesconfig,
- nomultiseg = nomultiseg)
+ nomultiseg=nomultiseg,
+ enablevhostuser=enablevhostuser,
+ snatconfig=snatconfig)
logger.debug('Writing VPP config to host {}: "{}"'.format(hostname,
vppconfig))
# 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 initctl stop {}'.format(VPP_SERVICE_NAME))
+ ssh.exec_command('sudo service {} stop'.format(VPP_SERVICE_NAME))
(ret, stdout, stderr) = \
- ssh.exec_command('sudo initctl start {}'.format(VPP_SERVICE_NAME))
+ ssh.exec_command('sudo service {} start'.format(VPP_SERVICE_NAME))
if ret != 0:
logger.debug('Restarting VPP failed on node {}'.
format(hostname))
(ret, stdout, stderr) = \
ssh.exec_command('echo show hardware-interfaces | '
'nc 0 5002')
-
if ret == 0:
vpp_is_running = True
else:
Code Review / csit.git / blobdiff