X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=resources%2Flibraries%2Fpython%2FVppConfigGenerator.py;h=4476cfa3ee8c434cdd3b33fee1dbfc16b85cb8e3;hb=01e72f9dce0ef3eeb10ca9097836f7d34e40fa0d;hp=def23712e5e4b392a66795c4b8bcb116a88c93f3;hpb=0ba508f0eac819c1985e825857f584b3d1537ffe;p=csit.git

diff --git a/resources/libraries/python/VppConfigGenerator.py b/resources/libraries/python/VppConfigGenerator.py
index def23712e5..4476cfa3ee 100644
--- 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:
@@ -180,6 +180,24 @@ class VppConfigGenerator(object):
         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.
 
@@ -331,14 +349,25 @@ class VppConfigGenerator(object):
         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.
+        :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):
@@ -346,6 +375,11 @@ class VppConfigGenerator(object):
         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.
 
@@ -355,19 +389,106 @@ class VppConfigGenerator(object):
         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.
-        :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
@@ -415,11 +536,11 @@ class VppConfigGenerator(object):
             # Sleep <waittime> seconds, up to <retry> times,
             # and verify if VPP is running.
             for _ in range(retries):
-                time.sleep(waittime)
+                time.sleep(1)
                 (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':
+                if ret == 0 and 'VPP not yet running' not in stdout:
                     break
             else:
                 raise RuntimeError('VPP failed to restart on node {}'.