diff options
| -rw-r--r-- | VPP_STABLE_VER_CENTOS | 2 | ||||
| -rw-r--r-- | VPP_STABLE_VER_UBUNTU | 2 | ||||
| -rw-r--r-- | VPP_STABLE_VER_UBUNTU_BIONIC | 2 | ||||
| -rw-r--r-- | docs/report/vpp_functional_tests/test_environment.rst | 2 | ||||
| -rw-r--r-- | docs/report/vpp_performance_tests/test_environment.rst | 2 | ||||
| -rw-r--r-- | resources/libraries/python/Constants.py | 3 | ||||
| -rw-r--r-- | resources/libraries/python/PapiExecutor.py | 2 | ||||
| -rw-r--r-- | resources/libraries/python/VppConfigGenerator.py | 7 |
8 files changed, 13 insertions, 9 deletions
diff --git a/VPP_STABLE_VER_CENTOS b/VPP_STABLE_VER_CENTOS index ce8af1664d..afd61f92cb 100644 --- a/VPP_STABLE_VER_CENTOS +++ b/VPP_STABLE_VER_CENTOS @@ -1 +1 @@ -19.08-rc0~806_g4f94464~b7558
\ No newline at end of file +20.01-rc0~3_g6595ff7~b7597
\ No newline at end of file diff --git a/VPP_STABLE_VER_UBUNTU b/VPP_STABLE_VER_UBUNTU index 79a2387b0c..9bc13a64e7 100644 --- a/VPP_STABLE_VER_UBUNTU +++ b/VPP_STABLE_VER_UBUNTU @@ -1 +1 @@ -19.08-rc0~806-g4f94464~b7752
\ No newline at end of file +20.01-rc0~3-g6595ff7~b7791
\ No newline at end of file diff --git a/VPP_STABLE_VER_UBUNTU_BIONIC b/VPP_STABLE_VER_UBUNTU_BIONIC index d0b3ddd088..96f8a22078 100644 --- a/VPP_STABLE_VER_UBUNTU_BIONIC +++ b/VPP_STABLE_VER_UBUNTU_BIONIC @@ -1 +1 @@ -19.08-rc0~806-g4f9446444
\ No newline at end of file +20.01-rc0~3-g6595ff7f8
\ No newline at end of file diff --git a/docs/report/vpp_functional_tests/test_environment.rst b/docs/report/vpp_functional_tests/test_environment.rst index b8a6b16f88..31ee0b809d 100644 --- a/docs/report/vpp_functional_tests/test_environment.rst +++ b/docs/report/vpp_functional_tests/test_environment.rst @@ -403,7 +403,7 @@ There is used the default startup configuration as defined in `VPP startup.conf` gid vpp } socksvr { - default + socket-name /run/vpp/api.sock } dpdk { diff --git a/docs/report/vpp_performance_tests/test_environment.rst b/docs/report/vpp_performance_tests/test_environment.rst index 48045e943e..71db52fb16 100644 --- a/docs/report/vpp_performance_tests/test_environment.rst +++ b/docs/report/vpp_performance_tests/test_environment.rst @@ -61,7 +61,7 @@ below: nodaemon } socksvr { - default + socket-name /run/vpp/api.sock } ip6 { diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py index d8550ab27a..0473ca2090 100644 --- a/resources/libraries/python/Constants.py +++ b/resources/libraries/python/Constants.py @@ -106,6 +106,9 @@ class Constants(object): # Equivalent to ~0 used in vpp code BITWISE_NON_ZERO = 0xffffffff + # Default path to VPP API socket. + SOCKSVR_PATH = "/run/vpp/api.sock" + # Mapping from NIC name to its bps limit. # TODO: Implement logic to lower limits to TG NIC or software. Or PCI. NIC_NAME_TO_LIMIT = { diff --git a/resources/libraries/python/PapiExecutor.py b/resources/libraries/python/PapiExecutor.py index 0e94fa61f5..8e59eff510 100644 --- a/resources/libraries/python/PapiExecutor.py +++ b/resources/libraries/python/PapiExecutor.py @@ -132,7 +132,7 @@ class PapiSocketExecutor(object): api_json_directory = None crc_checker_instance = None - def __init__(self, node, remote_vpp_socket="/run/vpp-api.sock"): + def __init__(self, node, remote_vpp_socket=Constants.SOCKSVR_PATH): """Store the given arguments, declare managed variables. :param node: Node to connect to and forward unix domain socket from. diff --git a/resources/libraries/python/VppConfigGenerator.py b/resources/libraries/python/VppConfigGenerator.py index 7ee3e2ceb0..15e8ffb3b5 100644 --- a/resources/libraries/python/VppConfigGenerator.py +++ b/resources/libraries/python/VppConfigGenerator.py @@ -20,6 +20,7 @@ in 7 various places of CSIT code. import re +from resources.libraries.python.Constants import Constants from resources.libraries.python.ssh import exec_cmd_no_error from resources.libraries.python.topology import NodeType from resources.libraries.python.topology import Topology @@ -196,10 +197,10 @@ class VppConfigGenerator(object): path = ['unix', 'exec'] self.add_config_item(self._nodeconfig, value, path) - def add_socksvr(self, socket="default"): + def add_socksvr(self, socket=Constants.SOCKSVR_PATH): """Add socksvr configuration.""" - path = ['socksvr', socket] - self.add_config_item(self._nodeconfig, '', path) + path = ['socksvr', 'socket-name'] + self.add_config_item(self._nodeconfig, socket, path) def add_api_segment_gid(self, value='vpp'): """Add API-SEGMENT gid configuration. |