Make default driver configurable

[csit.git] / resources / libraries / python / VppConfigGenerator.py

diff --git a/resources/libraries/python/VppConfigGenerator.py b/resources/libraries/python/VppConfigGenerator.py
index def2371..d1fc32e 100644 (file)
--- a/resources/libraries/python/VppConfigGenerator.py
+++ b/resources/libraries/python/VppConfigGenerator.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2018 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:
 # 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,6 +17,8 @@ import re
 import time
 
 from resources.libraries.python.ssh import SSH
 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
 
 from resources.libraries.python.topology import NodeType
 from resources.libraries.python.topology import Topology
 


@@ -180,6 +182,24 @@ class VppConfigGenerator(object):
         path = ['api-segment', 'gid']
         self.add_config_item(self._nodeconfig, value, path)
 
         path = ['api-segment', 'gid']
         self.add_config_item(self._nodeconfig, value, path)
 

+    def add_api_segment_global_size(self, value):
+        """Add API-SEGMENT global-size configuration.
+
+        :param value: Global size.
+        :type value: str
+        """
+        path = ['api-segment', 'global-size']
+        self.add_config_item(self._nodeconfig, value, path)
+
+    def add_api_segment_api_size(self, value):
+        """Add API-SEGMENT api-size configuration.
+
+        :param value: API size.
+        :type value: str
+        """
+        path = ['api-segment', 'api-size']
+        self.add_config_item(self._nodeconfig, value, path)
+

     def add_dpdk_dev(self, *devices):
         """Add DPDK PCI device configuration.
 
     def add_dpdk_dev(self, *devices):
         """Add DPDK PCI device configuration.
 


@@ -263,6 +283,15 @@ class VppConfigGenerator(object):
         path = ['dpdk', 'dev default', 'num-tx-desc']
         self.add_config_item(self._nodeconfig, value, path)
 
         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.
 
     def add_dpdk_socketmem(self, value):
         """Add DPDK socket memory configuration.
 


@@ -331,14 +360,25 @@ class VppConfigGenerator(object):
         path = ['ip6', 'heap-size']
         self.add_config_item(self._nodeconfig, value, path)
 
         path = ['ip6', 'heap-size']
         self.add_config_item(self._nodeconfig, value, path)
 

-    def add_plugin_disable(self, *plugins):
-        """Add plugin disable for specific plugin.
+    def add_ip_heap_size(self, value):
+        """Add IP heap-size configuration.

 
 

+        :param value: IP Heapsize amount.
+        :type value: str
+        """
+        path = ['ip', 'heap-size']
+        self.add_config_item(self._nodeconfig, value, path)
+
+    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.
         :param plugins: Plugin(s) to disable.

+        :type state: str

         :type plugins: list
         """
         for plugin in plugins:
         :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):
             self.add_config_item(self._nodeconfig, ' ', path)
 
     def add_dpdk_no_multi_seg(self):


@@ -346,6 +386,11 @@ class VppConfigGenerator(object):
         path = ['dpdk', 'no-multi-seg']
         self.add_config_item(self._nodeconfig, '', path)
 
         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.
 
     def add_nat(self, value='deterministic'):
         """Add NAT configuration.
 


@@ -355,19 +400,106 @@ class VppConfigGenerator(object):
         path = ['nat']
         self.add_config_item(self._nodeconfig, value, path)
 
         path = ['nat']
         self.add_config_item(self._nodeconfig, value, path)
 

-    def apply_config(self, filename=None, waittime=5,
-                     retries=12, restart_vpp=True):
+    def add_tcp_preallocated_connections(self, value):
+        """Add TCP pre-allocated connections.
+
+        :param value: The number of pre-allocated connections.
+        :type value: int
+        """
+        path = ['tcp', 'preallocated-connections']
+        self.add_config_item(self._nodeconfig, value, path)
+
+    def add_tcp_preallocated_half_open_connections(self, value):
+        """Add TCP pre-allocated half open connections.
+
+        :param value: The number of pre-allocated half open connections.
+        :type value: int
+        """
+        path = ['tcp', 'preallocated-half-open-connections']
+        self.add_config_item(self._nodeconfig, value, path)
+
+    def add_session_event_queue_length(self, value):
+        """Add session event queue length.
+
+        :param value: Session event queue length.
+        :type value: int
+        """
+        path = ['session', 'event-queue-length']
+        self.add_config_item(self._nodeconfig, value, path)
+
+    def add_session_preallocated_sessions(self, value):
+        """Add the number of pre-allocated sessions.
+
+        :param value: Number of pre-allocated sessions.
+        :type value: int
+        """
+        path = ['session', 'preallocated-sessions']
+        self.add_config_item(self._nodeconfig, value, path)
+
+    def add_session_v4_session_table_buckets(self, value):
+        """Add number of v4 session table buckets to the config.
+
+        :param value: Number of v4 session table buckets.
+        :type value: int
+        """
+        path = ['session', 'v4-session-table-buckets']
+        self.add_config_item(self._nodeconfig, value, path)
+
+    def add_session_v4_session_table_memory(self, value):
+        """Add the size of v4 session table memory.
+
+        :param value: Size of v4 session table memory.
+        :type value: str
+        """
+        path = ['session', 'v4-session-table-memory']
+        self.add_config_item(self._nodeconfig, value, path)
+
+    def add_session_v4_halfopen_table_buckets(self, value):
+        """Add the number of v4 halfopen table buckets.
+
+        :param value: Number of v4 halfopen table buckets.
+        :type value: int
+        """
+        path = ['session', 'v4-halfopen-table-buckets']
+        self.add_config_item(self._nodeconfig, value, path)
+
+    def add_session_v4_halfopen_table_memory(self, value):
+        """Add the size of v4 halfopen table memory.
+
+        :param value: Size of v4 halfopen table memory.
+        :type value: str
+        """
+        path = ['session', 'v4-halfopen-table-memory']
+        self.add_config_item(self._nodeconfig, value, path)
+
+    def add_session_local_endpoints_table_buckets(self, value):
+        """Add the number of local endpoints table buckets.
+
+        :param value: Number of local endpoints table buckets.
+        :type value: int
+        """
+        path = ['session', 'local-endpoints-table-buckets']
+        self.add_config_item(self._nodeconfig, value, path)
+
+    def add_session_local_endpoints_table_memory(self, value):
+        """Add the size of local endpoints table memory.
+
+        :param value: Size of local endpoints table memory.
+        :type value: str
+        """
+        path = ['session', 'local-endpoints-table-memory']
+        self.add_config_item(self._nodeconfig, value, path)
+
+    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.
         """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
         :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
         :type retries: int
         :type restart_vpp: bool.
         :raises RuntimeError: If writing config file failed or restart of VPP


@@ -382,48 +514,38 @@ class VppConfigGenerator(object):
             filename = self._vpp_startup_conf
 
         if self._vpp_startup_conf_backup is not None:
             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:
             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:
             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:
 
         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):
 
             # 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:
                     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.
 
     def restore_config(self):
         """Restore VPP startup.conf from backup.


@@ -434,9 +556,9 @@ class VppConfigGenerator(object):
         ssh = SSH()
         ssh.connect(self._node)
 
         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:
         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))