VPP changed the default socket path in:
https://gerrit.fd.io/r/c/vpp/+/21100
Instead of "default", explicit value is used now.
It coincides with VPP default one,
and is stored in Constants.py (except documentation).
The file name for robot side forwarded socket remains,
as the path leading to is is different anyway.
Change-Id: I0058d16794a3cd04411640c2c8d5fd4ee8cb997d
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
-19.08-rc0~806_g4f94464~b7558
\ No newline at end of file
+20.01-rc0~3_g6595ff7~b7597
\ No newline at end of file
-19.08-rc0~806-g4f94464~b7752
\ No newline at end of file
+20.01-rc0~3-g6595ff7~b7791
\ No newline at end of file
-19.08-rc0~806-g4f9446444
\ No newline at end of file
+20.01-rc0~3-g6595ff7f8
\ No newline at end of file
+ socket-name /run/vpp/api.sock
+ socket-name /run/vpp/api.sock
# Equivalent to ~0 used in vpp code
BITWISE_NON_ZERO = 0xffffffff
# 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 = {
# 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 = {
api_json_directory = None
crc_checker_instance = None
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.
"""Store the given arguments, declare managed variables.
:param node: Node to connect to and forward unix domain socket from.
+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
from resources.libraries.python.ssh import exec_cmd_no_error
from resources.libraries.python.topology import NodeType
from resources.libraries.python.topology import Topology
path = ['unix', 'exec']
self.add_config_item(self._nodeconfig, value, path)
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."""
"""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.
def add_api_segment_gid(self, value='vpp'):
"""Add API-SEGMENT gid configuration.