diff options
| author |   Ray Kinsella <mdr@ashroe.eu> | 2020-03-10 14:35:32 +0000 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2020-04-28 11:10:50 +0000 |
| commit | 4830e4f78fb8e46b23a1a0711cd06969a77d8d95 (patch) | |
| tree | 36ff9c5252a62a8b5a50867a31c094c6a1bc1cda /test/framework.py | |
| parent | a568a19b2956ed8b94b11c2ef041412473dc8442 (diff) | |
vlib: startup multi-arch variant configuration
Support for startup node multi-arch variant selection through startup.conf.
This is to facilitate unit, functional testing and benchmarking of non-default
multi-arch variant node code path. Also added parameters to make test, to
specific using multi-arch variants in unit testing.
Type: improvement
Signed-off-by: Ray Kinsella <mdr@ashroe.eu>
Change-Id: I94fd332bb629683b7a7dd770ee9f615a9a424060
Diffstat (limited to 'test/framework.py')
| -rw-r--r-- | test/framework.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/test/framework.py b/test/framework.py index c21d1882be7..19834026ef9 100644 --- a/test/framework.py +++ b/test/framework.py @@ -381,6 +381,12 @@ class VppTestCase(unittest.TestCase): if not hasattr(cls, "worker_config"): cls.worker_config = "" + default_variant = os.getenv("VARIANT") + if default_variant is not None: + default_variant = "defaults { %s 100 }" % default_variant + else: + default_variant = "" + cls.vpp_cmdline = [cls.vpp_bin, "unix", "{", "nodaemon", debug_cli, "full-coredump", coredump_size, "runtime-dir", cls.tempdir, "}", @@ -391,11 +397,13 @@ class VppTestCase(unittest.TestCase): "physmem", "{", "max-size", "32m", "}", "statseg", "{", "socket-name", cls.stats_sock, "}", "socksvr", "{", "socket-name", cls.api_sock, "}", + "node { ", default_variant, "}", "plugins", "{", "plugin", "dpdk_plugin.so", "{", "disable", "}", "plugin", "rdma_plugin.so", "{", "disable", "}", "plugin", "unittest_plugin.so", "{", "enable", "}"] + cls.extra_vpp_plugin_config + ["}", ] + if cls.extra_vpp_punt_config is not None: cls.vpp_cmdline.extend(cls.extra_vpp_punt_config) if plugin_path is not None: |