tests: refactor extra_vpp_punt_config

Rename extra_vpp_punt_config to a more generic name extra_vpp_config to
better fit its purpose. It's fit for general use and already used that
way by quic and vcl tests anyway.

Type: refactor
Signed-off-by: Klement Sekera <klement.sekera@gmail.com>
Change-Id: Ib0a5789b0dbb3a8c3cae654dea4e32ac5e56dd41

diff --git a/test/asf/asfframework.py b/test/asf/asfframework.py
index 5c64454..1df1cb4 100644 (file)
--- a/test/asf/asfframework.py
+++ b/test/asf/asfframework.py
@@ -288,7 +288,7 @@ class VppTestCase(CPUInterface, unittest.TestCase):
     """
 
     extra_vpp_statseg_config = ""
-    extra_vpp_punt_config = []
+    extra_vpp_config = []
     extra_vpp_plugin_config = []
     logger = null_logger
     vapi_response_timeout = 5
@@ -481,8 +481,8 @@ class VppTestCase(CPUInterface, unittest.TestCase):
             ]
         )
 
-        if cls.extra_vpp_punt_config is not None:
-            cls.vpp_cmdline.extend(cls.extra_vpp_punt_config)
+        if cls.extra_vpp_config is not None:
+            cls.vpp_cmdline.extend(cls.extra_vpp_config)
 
         if not cls.debug_attach:
             cls.logger.info("vpp_cmdline args: %s" % cls.vpp_cmdline)

diff --git a/test/asf/test_quic.py b/test/asf/test_quic.py
index 681385a..8179b2f 100644 (file)
--- a/test/asf/test_quic.py
+++ b/test/asf/test_quic.py
@@ -133,7 +133,7 @@ class QUICEchoIntTestCase(QUICTestCase):
     """QUIC Echo Internal Test Case"""
 
     test_bytes = " test-bytes"
-    extra_vpp_punt_config = ["session", "{", "enable", "poll-main", "}"]
+    extra_vpp_config = ["session", "{", "enable", "poll-main", "}"]
 
     def setUp(self):
         super(QUICEchoIntTestCase, self).setUp()
@@ -204,7 +204,7 @@ class QUICEchoExtTestCase(QUICTestCase):
     vpp_worker_count = 1
     server_fifo_size = "1M"
     client_fifo_size = "4M"
-    extra_vpp_punt_config = [
+    extra_vpp_config = [
         "session",
         "{",
         "enable",

diff --git a/test/asf/test_vcl.py b/test/asf/test_vcl.py
index fbc8249..9853529 100644 (file)
--- a/test/asf/test_vcl.py
+++ b/test/asf/test_vcl.py
@@ -67,7 +67,7 @@ class VCLTestCase(VppTestCase):
     def setUpClass(cls):
         if cls.session_startup:
             conf = "session {" + " ".join(cls.session_startup) + "}"
-            cls.extra_vpp_punt_config = [conf]
+            cls.extra_vpp_config = [conf]
         super(VCLTestCase, cls).setUpClass()
 
     @classmethod

diff --git a/test/framework.py b/test/framework.py
index f90aa43..2ea5c7c 100644 (file)
--- a/test/framework.py
+++ b/test/framework.py
@@ -329,7 +329,7 @@ class VppTestCase(CPUInterface, unittest.TestCase):
     """
 
     extra_vpp_statseg_config = ""
-    extra_vpp_punt_config = []
+    extra_vpp_config = []
     extra_vpp_plugin_config = []
     logger = null_logger
     vapi_response_timeout = 5
@@ -538,8 +538,8 @@ class VppTestCase(CPUInterface, unittest.TestCase):
             ]
         )
 
-        if cls.extra_vpp_punt_config is not None:
-            cls.vpp_cmdline.extend(cls.extra_vpp_punt_config)
+        if cls.extra_vpp_config is not None:
+            cls.vpp_cmdline.extend(cls.extra_vpp_config)
 
         if not cls.debug_attach:
             cls.logger.info("vpp_cmdline args: %s" % cls.vpp_cmdline)

diff --git a/test/test_cnat.py b/test/test_cnat.py
index e2e7c6b..1881653 100644 (file)
--- a/test/test_cnat.py
+++ b/test/test_cnat.py
@@ -41,7 +41,7 @@ class CnatCommonTestCase(VppTestCase):
     # turn the scanner off whilst testing otherwise sessions
     # will time out
     #
-    extra_vpp_punt_config = [
+    extra_vpp_config = [
         "cnat",
         "{",
         "session-db-buckets",

diff --git a/test/test_punt.py b/test/test_punt.py
index 378b25d..75d5d99 100644 (file)
--- a/test/test_punt.py
+++ b/test/test_punt.py
@@ -110,7 +110,7 @@ class TestPuntSocket(VppTestCase):
 
     @classmethod
     def setUpConstants(cls):
-        cls.extra_vpp_punt_config = [
+        cls.extra_vpp_config = [
             "punt",
             "{",
             "socket",