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

diff --git a/resources/libraries/python/VppConfigGenerator.py b/resources/libraries/python/VppConfigGenerator.py
index f21f027ba4..4476cfa3ee 100644
--- a/resources/libraries/python/VppConfigGenerator.py
+++ b/resources/libraries/python/VppConfigGenerator.py
@@ -358,14 +358,16 @@ class VppConfigGenerator(object):
         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):
@@ -477,19 +479,16 @@ class VppConfigGenerator(object):
         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
@@ -537,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 {}'.